Changeset 2628 for GTP/trunk/App/Demos/Illum/Ogre/src

Timestamp:

01/23/08 00:08:53 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre/src

Files:

• Common/src/SceneSerializer.cpp (modified) (1 diff)
• Moria/scripts/Moria.7.10.vcproj (modified) (1 diff)
• ReflectionTest/include/ReflectionTest.h (modified) (9 diffs)

GTP/trunk/App/Demos/Illum/Ogre/src/Common/src/SceneSerializer.cpp

@@ -188 +188 @@
 #else
         context.sceneNode->setOrientation(transformMatrix.extractQuaternion());
-        context.sceneNode->scale((Vector3(x.x,x.y,x.z)).length(),
+                context.sceneNode->scale((Vector3(x.x,x.y,x.z)).length(),
                                                                 (Vector3(y.x,y.y,y.z)).length(),
                                                                 (Vector3(z.x,z.y,z.z)).length());
-        context.sceneNode->translate(transformMatrix.getTrans());
+                context.sceneNode->translate(transformMatrix.getTrans());
 #endif
         

GTP/trunk/App/Demos/Illum/Ogre/src/Moria/scripts/Moria.7.10.vcproj

@@ -102 +102 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="OgreMain.lib IllumModule_Ogre.lib IllumModule.lib NxOgre.lib"
+                                AdditionalDependencies="OgreMain.lib IllumModule_Ogre.lib IllumModule.lib NxOgre.lib GeoLodLibraryDLL.lib"
                                 OutputFile="$(OutDir)/Moria.exe"
                                 LinkIncremental="1"

GTP/trunk/App/Demos/Illum/Ogre/src/ReflectionTest/include/ReflectionTest.h

@@ -32 +32 @@
 
 float worldSizeVar = 0.002;
-float refIndex = 0.995;
+float refIndex = 0.8;
 int scene = 1;
 FrameCapture* capture;
@@ -39 +39 @@
 bool useCauInt = true;
 
-int currentMaterial = 0;
-int currentObject = 1;
+int currentMaterial = 2;
+int currentObject = 3;
 String objectNames[] = {String("sphere.mesh"),
                         String("teapot.mesh"),
@@ -127 +127 @@
                         worldSizeVar -= 0.002;
                         if(worldSizeVar < 0.002)worldSizeVar = 0.002;
-                        MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/MultiBounce/CauCube_Trianglesobject_SE_0_clone");
+                        MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/MultiBounce/CauCube_Triangles_clone_object_SE_0");
                         if(!mat.isNull())
                         {
@@ -137 +137 @@
         {
                         worldSizeVar += 0.002;
-                        MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/MultiBounce/CauCube_Trianglesobject_SE_0_clone");
+                        MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/MultiBounce/CauCube_Triangles_clone_object_SE_0");
                         if(!mat.isNull())
                         {
@@ -148 +148 @@
                         useCauInt = !useCauInt;
 
-                        MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/MultiBounce/CauCube_Trianglesobject_SE_0_clone");
+                        MaterialPtr mat = MaterialManager::getSingleton().getByName("GTP/MultiBounce/CauCube_Triangles_clone_object_SE_0");
                         if(!mat.isNull())
                         {
@@ -176 +176 @@
                 if (mInputDevice->isKeyDown(KC_J))
         {                       
-                        refIndex -= 0.001;
+                        refIndex -= 0.01;
 
                         MaterialPtr mat1 = MaterialManager::getSingleton().getByName(materialNames[currentMaterial]+"_clone_object_SE_0");
@@ -194 +194 @@
                 if (mInputDevice->isKeyDown(KC_K))
         {
-                        refIndex += 0.001;
+                        refIndex += 0.01;
                         
                         MaterialPtr mat1 = MaterialManager::getSingleton().getByName(materialNames[currentMaterial]+"_clone_object_SE_0");
@@ -505 +505 @@
 
                 mSceneMgr->setShadowTechnique(SHADOWTYPE_NONE);
-        
+/*      
                 Light* redLight1 = mSceneMgr->createLight("RedLight1");
                 redLight1->setType(Light::LT_POINT);
@@ -523 +523 @@
                 greenLightNode1->setPosition(1.312,1.313,0);
                 greenLightNode1->attachObject(greenLight1); 
-
+*/
                 Light* mainBlueLight = mSceneMgr->createLight("MainBlueLight");
                 mainBlueLight->setType(Light::LT_SPOTLIGHT);