Changeset 2451

Timestamp:

06/13/07 16:07:30 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Games/CarDriving_BME/Media/materials

Files:

• programs/CarReflections.hlsl (modified) (8 diffs)
• programs/DiffuseBump.hlsl (modified) (7 diffs)
• programs/GameTools_Localized_EnvMap.hlsl (modified) (3 diffs)
• programs/bottle.hlsl (modified) (5 diffs)
• scripts/bottle.material (deleted)
• scripts/bottle.material.old (added)
• scripts/bottle_classic.material.old (added)
• scripts/bottle_noeffects.material (added)
• scripts/car.material (deleted)
• scripts/car.material.old (added)
• scripts/car_classic.old (added)
• scripts/car_noeffects.material (added)
• scripts/scene1.material (modified) (1 diff)
• scripts/wheel.material (deleted)
• scripts/wheel.material.old (added)
• scripts/wheel_classic.material.old (added)
• scripts/wheel_noefffects.material (added)

GTP/trunk/App/Games/CarDriving_BME/Media/materials/programs/CarReflections.hlsl

@@ +1 @@
+//#define EFFECTS
+//#define LOCALIZATION
+
 float3 F0;
 
@@ -52 +55 @@
                 uniform float4x4 worldViewProj,
                 uniform float4x4 world,
-                uniform float4x4 worldIT)
+                uniform float4x4 worldI)
 {
  
   hPos = mul(worldViewProj, position);
   wPos = mul(world, position).xyz;  
-  mNormal = mul(normal, worldIT);
+  mNormal = mul(normal, worldI);
   //mNormal *=-1;
  //mNormal = normal;  
@@ -84 +87 @@
         float3 mPos = wPos - lastCenter;
         float3 V = normalize(wPos - cameraPos);
+
+#ifdef EFFECTS
         float3 R = normalize(reflect( V, mNormal));
                 
         newTexCoord = R;        
-        
+#ifdef LOCALIZATION     
         newTexCoord = Hit(mPos, R, DistanceMap);
+#endif
         Color = readCubeMap(CubeMap, newTexCoord );     
         
@@ -107 +113 @@
         Color = Color * float4(F,1);
         
-        
+#endif  
 //phong
         
@@ -135 +141 @@
         Color = float4(1,1,1,1);
 
+#ifdef EFFECTS
         //metallic reflection   
         mNormal = normalize(mNormal);
@@ -144 +151 @@
                 
         newTexCoord = R;        
-        
+#ifdef LOCALIZATION     
         newTexCoord = Hit(mPos, R, DistanceMap);
+#endif
         Color = readCubeMap(CubeMap, newTexCoord );             
+#endif
         
 }
@@ -163 +172 @@
         Color = float4(1,1,1,1);
 
+#ifdef EFFECTS
         //metallic reflection   
         mNormal = normalize(mNormal);
@@ -172 +182 @@
                 
         newTexCoord = R;        
-        
+#ifdef LOCALIZATION
         newTexCoord = Hit(mPos, R, DistanceMap);
+#endif
         Color = readCubeMap(CubeMap, newTexCoord );
         Color.a = 1;
+#endif
         Color *= glasColor;             
         

GTP/trunk/App/Games/CarDriving_BME/Media/materials/programs/DiffuseBump.hlsl

@@ -1 @@
-float4x4 world_IT;
+//#define EFFECTS
+
+float4x4 world_I;
 int REDUCED_CUBEMAP_SIZE = 8;
 
@@ -105 +107 @@
   hPos = mul(worldViewProj, position);
   wPos = mul(world, position).xyz;  
-  //mNormal = mul(normal, world_IT);
-  mNormal = normal;
+  mNormal = normalize(mul(normal, world_I));
   otexCoord = texCoord;
-  Tangent = tangent;  
+  Tangent = normalize(mul(tangent, world_I));  
   Binormal = cross(tangent, normal); 
 }
@@ -119 +120 @@
            uniform float3 cameraPos,
            uniform float3 lastCenter,
-           uniform half3 lightPosition,                         
+           uniform half4 lightPosition,                         
            uniform samplerCUBE SmallEnvMapSampler : register(s0),
            uniform samplerCUBE DistanceEnvMapSampler : register(s1),
@@ -128 +129 @@
     REDUCED_CUBEMAP_SIZE = 4;
         
+    Tangent = normalize(Tangent);
+    N = normalize(N);
+    Binormal = normalize(Binormal);
     //V = /*-*/normalize( V );
     float3 V = normalize(pos - cameraPos);      // 
@@ -134 +138 @@
         half3 tNormal = tex2D(NormalMap, Tex).rgb;      
       
-    N =mul(tNormal, ModelToTangent );
-    N = mul( N, world_IT );
-    N = normalize(N);
+    N = normalize(mul(tNormal, ModelToTangent ));
     
     float3 R = reflect(V, N);
@@ -143 +145 @@
     float4 intens = 0;
     
-        
+#ifdef EFFECTS  
         for (int x = 0; x < REDUCED_CUBEMAP_SIZE; x++)                  // az envmap minden texelére
          for (int y = 0; y < REDUCED_CUBEMAP_SIZE; y++)
@@ -178 +180 @@
                 intens += GetContibution( L, pos, N, V, SmallEnvMapSampler, DistanceEnvMapSampler);
         }
-        
-        half3 light = lightPosition;
+
+#endif  
+        half3 light = lightPosition.xyz;
         half3 L = normalize(light);
-        half3 H = normalize(L + V);
+        half3 H = normalize(L - V);
         half4 lighting = lit(dot(N, L),dot(N, H), 20);
 
         float4 retColor = intens;
         float4 texColor = tex2D(ColorTexture, Tex);
-        retColor = intens * texColor * 1.5
+#ifdef EFFECTS  
+        
+                retColor = intens * texColor * 1.5
                           + lighting.y * texColor * 0.15 
                           + lighting.z * 0.15                   
                          ;
+#else
+retColor =lighting.y * texColor
+                          + lighting.z;
+#endif
         return retColor;
 }

GTP/trunk/App/Games/CarDriving_BME/Media/materials/programs/GameTools_Localized_EnvMap.hlsl

@@ +1 @@
+//#define EFFECTS
+//#define LOCALIZATION
+
 //metal:
 float3 n, k;    // R 700 nm, G 550 nm, B 435 nm 
@@ -160 +163 @@
         float3 mPos = wPos - lastCenter;
         float3 V = normalize(wPos - cameraPos);
+
         float3 R = normalize(reflect( V, mNormal));
                 
+#ifdef EFFECTS
         newTexCoord = R;        
-        
+#ifdef LOCALIZATION
         newTexCoord = Hit(mPos, R, DistanceMap);
+#endif
         Color = readCubeMap(CubeMap, newTexCoord );
-        
+#else
+        Color = 1;      
+#endif
+
         //Color = float4(mNormal + lastCenter.x*0.0000001, 1);  
         
@@ -185 +194 @@
         }       
         
-        Color = Color * float4(F,1);
-        
+        Color = Color * float4(F,1);    
         //Color = length(lastCenter.xyz) * 0.1;
 }

GTP/trunk/App/Games/CarDriving_BME/Media/materials/programs/bottle.hlsl

@@ +1 @@
+//#define EFFECT
+//#define LOCALIZATION
+
 float4 readCubeMap(samplerCUBE cm, float3 coord)                
 {
@@ -50 +53 @@
                 uniform float4x4 worldViewProj,
                 uniform float4x4 world,
-                uniform float4x4 worldIT)
+                uniform float4x4 worldI)
 {
  
   hPos = mul(worldViewProj, position);
   wPos = mul(world, position).xyz;  
-  mNormal = mul(normal, worldIT);
+  mNormal = mul(normal, worldI);
  // mNormal = normal;
   otexCoord = texCoord;
@@ -81 +84 @@
         float3 mPos = wPos - lastCenter;
         float3 V = normalize(wPos - cameraPos);
-        float3 R = normalize(reflect( V, mNormal));
+
+#ifdef EFFECT
+                float3 R = normalize(reflect( V, mNormal));
         
         float3 T =  normalize(refract(V, mNormal, 0.9));
@@ -87 +92 @@
         RR = R; TT = T; 
         
+        #ifdef LOCALIZATION
         RR = Hit(mPos, R, DistanceMap);
         TT = Hit(mPos, T, DistanceMap);
+        #endif
         
         float4 reflectcolor = readCubeMap(CubeMap, RR );                
@@ -98 +105 @@
 
         Color = (F * reflectcolor + (1-F) * refractcolor * float4(color,1)) ;
-        
+#else
+        Color = float4(color, 1);
+#endif
         half3 light = lightPosition; 
         V = -V;

GTP/trunk/App/Games/CarDriving_BME/Media/materials/scripts/scene1.material

@@ -16 +16 @@
                                         
                                 }
-                                RenderTechnique CausticReciever
-                                {
-                                 max_caster_count       10      
-                                }
+                                //RenderTechnique CausticReciever
+                                //{
+                                // max_caster_count     10      
+                                //}
                         }