Changeset 1556

Timestamp:

10/03/06 09:41:15 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/EnvMap

Files:

• .matrix (modified) (1 diff)
• .params (modified) (1 diff)
• EnvMap.cpp (modified) (1 diff)
• EnvMap.fx (modified) (2 diffs)
• EnvMap_2003.suo (modified) (previous)

GTP/trunk/App/Demos/Illum/EnvMap/.matrix

@@ -1 +1 @@
 
 World matrix:
-         1  -0.003845  -0.004636          0
-  0.004172     0.9974    0.07259          0
-  0.004345   -0.07261     0.9974          0
--1.863e-009 -5.96e-008       6.82          1
+         1          0          0          0
+         0          1          0          0
+         0          0          1          0
+         0          0      4.922          1
 
 Camera position:
- 0.0316175  -0.495054   -6.80194
+         0          0   -4.92206
 
 Mesh position:
--0.0666665          0          0
+  0.133334          0          0

GTP/trunk/App/Demos/Illum/EnvMap/.params

@@ -1 +1 @@
 47 version ----- RayTraceEffects: Saved parameters of the algorithm -----
 Bool values:
-0111
+0011
 (Help [F1]; [F]ireballs; Multiple [O]bjects; Between [W]alls only; )
 Float values:
-3       (WhichMethod [TAB,Q], 0..3)
-8       (WhichMesh [Home,End], 0..9)
-34      (Mesh size [Ins,Del], 0..100)
+1       (WhichMethod [TAB,Q], 0..3)
+1       (WhichMesh [Home,End], 0..9)
+28      (Mesh size [Ins,Del], 0..100)
 1       (Resolution [M], 0..3)
 0       (ShowCubeMap [C], 0..3)
-50      (Intensity [+,-], 0..100)
-3       (shininess [/,*], 0..30)
+62      (Intensity [+,-], 0..100)
+0       (shininess [/,*], 0..30)

GTP/trunk/App/Demos/Illum/EnvMap/EnvMap.cpp

@@ -425 +425 @@
                 V( g_pEffect->SetInt ( "iShowCubeMap", pp.GetInt( iShowCubeMap ) ));
 
+        D3DXVECTOR4 facecolors[]={D3DXVECTOR4(1,0,0,1),
+                                                        D3DXVECTOR4(1,0,1,1),
+                                                        D3DXVECTOR4(1,1,0,1),
+                                                        D3DXVECTOR4(0,0,1,1),
+                                                        D3DXVECTOR4(0,1,0,1),
+                                                        D3DXVECTOR4(0,1,1,1)};
         for( int i=0; i<6; i++ )
         {
-                objColor = D3DXVECTOR4(0.4f-i*0.1f, i*0.1f, (i%2)*0.4f, 1);             // a colorful room
-                if (i==3) objColor += D3DXVECTOR4(0.05, 0.05, 0, 1);            
+        /*      objColor = D3DXVECTOR4(0.4f-i*0.1f, i*0.1f, (i%2)*0.4f, 1);             // a colorful room
+                if (i==3) objColor += D3DXVECTOR4(0.05, 0.05, 0, 1);*/          
+
+                objColor = facecolors[i];               
 
                 g_pEffect->SetVector( "objColor", &objColor );

GTP/trunk/App/Demos/Illum/EnvMap/EnvMap.fx

@@ -694 +694 @@
 float4 IlluminatedScenePS( _IlluminatedSceneVS_output IN ) : COLOR0
 {
-    float3 color = objColor * tex2D(DecorationSampler, IN.TexCoord);
-    
+    float3 color = objColor;// * tex2D(DecorationSampler, IN.TexCoord);
+    /*
     if (iShowCubeMap > 0) 
     {
@@ -711 +711 @@
         }
         else color *= 0.7;
-                
+        */      
         float dist = length( IN.Position );
     return float4(color, dist);