Changeset 877 for GTP/trunk

Timestamp:

05/02/06 16:34:09 (19 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/Envmap/EnvMap.cpp (modified) (4 diffs)

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

@@ -58 +58 @@
 
         // central mesh
-        mesh = new Mesh(MESH1, TEX0, 0.8, D3DXVECTOR3(0,0,0));
+        mesh = new Mesh(MESH1, TEX0, 1, D3DXVECTOR3(0,0,0));
         bCubeMapIsValid = false;
         //ChooseMesh(whichMesh);
@@ -162 +162 @@
 {
         if (pp.Get( bAutoGenCubeMap ))          // calculate cube maps for each frame
+        {
                 bCubeMapIsValid = false;
-
-        if ( !bShininessIsValid )       
-        // refresh cos texture
-        {
-                if ( pp.GetInt( iWhichMethod ) == DIFFUSE_SPECULAR )
-                        PreConvolve(pCubeTextureSmall, pCubeTexturePreConvolved);
-                else if ( pp.GetInt( iWhichMethod ) == DIFFUSE_SPECULAR_LOCALIZED_COSTEX )
-                        GenerateCosTextureIfNotFound();
         }
 
@@ -188 +181 @@
                         RenderCubeMap( pCubeTexture );
                         RenderCubeMap( pCubeTexture );  // don't ask why
-
-                        V( g_pEffect->SetFloat( "texel_size",  0 ) );
-                        ReduceCubeMapSize(pCubeTexture, pCubeTextureSmall);
-                        PreConvolve(pCubeTextureSmall, pCubeTexturePreConvolved);
                 }
-                else
+
+                //V( g_pEffect->SetFloat( "texel_size",  0 ) );
+
+                if ( pp.GetInt( iWhichMethod ) == DIFFUSE_SPECULAR 
+                  || pp.GetInt( iWhichMethod ) == DIFFUSE_SPECULAR_LOCALIZED
+                  || pp.GetInt( iWhichMethod ) == DIFFUSE_SPECULAR_LOCALIZED_COSTEX )
                 {
-                        ReduceCubeMapSize(pCubeTextureFromFile, pCubeTextureSmall);
-                        PreConvolve(pCubeTextureSmall, pCubeTexturePreConvolved);
+                        ReduceCubeMapSize( pp.Get( bCubeMapFromFile ) ? pCubeTextureFromFile : pCubeTexture,
+                                pCubeTextureSmall);
+
+                        bShininessIsValid = false;
                 }
 
@@ -203 +199 @@
 
                 bCubeMapIsValid = true; 
+        }
+
+        if ( !bShininessIsValid )       
+        // refresh cos texture
+        {
+                if ( pp.GetInt( iWhichMethod ) == DIFFUSE_SPECULAR || pp.GetInt( iWhichMethod ) == DIFFUSE_SPECULAR_LOCALIZED )
+                        PreConvolve(pCubeTextureSmall, pCubeTexturePreConvolved);
+                else if ( pp.GetInt( iWhichMethod ) == DIFFUSE_SPECULAR_LOCALIZED_COSTEX )
+                        GenerateCosTextureIfNotFound();
+
+                bShininessIsValid = true;
         }