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

Timestamp:

10/27/06 17:40:02 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• CausticTest/include/CausticTest.h (modified) (3 diffs)
• CausticTest/scripts/CausticTest.vcproj (modified) (1 diff)
• CausticTest/scripts/CausticTest.vcproj.7.10.old (added)
• DiffuseTest/include/DiffuseTest.h (modified) (2 diffs)
• DiffuseTest/scripts/DiffuseTest.vcproj.7.10.old (added)
• GameToolsParticleDemo/scripts/GameToolsParticleDemo.vcproj.7.10.old (added)
• GameToolsRaytraceDemo/include/GameToolsRaytraceDemo.h (modified) (2 diffs)
• GameToolsRaytraceDemo/scripts/GameToolsRaytraceDemo.vcproj (modified) (1 diff)
• GameToolsRaytraceDemo/scripts/GameToolsRaytraceDemo.vcproj.7.10.old (added)
• GameToolsToneMapDemo/scripts/GameToolsToneMapDemo.vcproj.7.10.old (added)
• HierarchicalSystem/scripts/HierarchicalSystem.vcproj.7.10.old (added)
• PRMDemo/scripts/PRMDemo.vcproj.7.10.old (added)

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

@@ -95 +95 @@
                                 
                 }
+                if (mInputDevice->isKeyDown(KC_HOME))
+        {
+                        Vector3 lPos = lightNode->getPosition();
+                        Vector3 lDir = sphereNode->getPosition() - lPos;
+                        lDir.normalise();
+                        Vector3 right = lDir.crossProduct(Vector3(0,1,0));
+                        Vector3 up = lDir.crossProduct(right);
+                        lPos += right,
+                        lightNode->setPosition(lPos);
+                        light->setDirection(lDir);
+                }
+                if (mInputDevice->isKeyDown(KC_END))
+        {
+                        Vector3 lPos = lightNode->getPosition();
+                        Vector3 lDir = sphereNode->getPosition() - lPos;
+                        lDir.normalise();
+                        Vector3 right = lDir.crossProduct(Vector3(0,1,0));
+                        Vector3 up = lDir.crossProduct(right);
+                        lPos -= right,                  
+                        lightNode->setPosition(lPos);
+                        light->setDirection(lDir);
+                                
+                }
                 return ExampleFrameListener::processUnbufferedKeyInput(evt);
         }
@@ -155 +178 @@
 
                 // Skybox
-        mSceneMgr->setSkyBox(true, "Examples/MorningSkyBox");
+        mSceneMgr->setSkyBox(true, "Examples/EveningSkyBox");
 
                 SceneNode* rootNode = mSceneMgr->getRootSceneNode();
 
-        Entity* sphere = mSceneMgr->createEntity("sphere", "sphere.mesh");
+        Entity* sphere = mSceneMgr->createEntity("sphere", "head.mesh");
                 sphere->setMaterialName("GameTools/CausticGlass");
                 sphereNode = rootNode->createChildSceneNode();
-                sphereNode->setScale(0.1, 0.1, 0.1);
+                //sphereNode->setScale(0.1, 0.1, 0.1);//sphere
                 sphereNode->setPosition(0, 50, 0);
                 sphereNode->attachObject(sphere);
                 sphereNode->_updateBounds();
 
+                Entity* room = mSceneMgr->createEntity("room", "atlascube.mesh");
+                room->setMaterialName("TestPlane");
+                SceneNode *roomNode = rootNode->createChildSceneNode();
+                //roomNode->setScale(0.1, 0.1, 0.1);
+                roomNode->setPosition(0, 50, 0);
+                roomNode->attachObject(room);
+                
 
                 Light* mainLight = mSceneMgr->createLight("MainLight");
                 light = mainLight;
-                mainLight->setType(Light::LT_DIRECTIONAL);
+                mainLight->setType(Light::LT_POINT);
         mainLight->setDiffuseColour(ColourValue::White);
                 mainLight->setSpecularColour(ColourValue::White);
@@ -184 +214 @@
                 
 
-                createPlane("ground", "TestPlane", Vector3(0,0,0), Vector2(500,500));
+                //createPlane("ground", "TestPlane", Vector3(0,0,0), Vector2(500,500));
         
                 OgreIlluminationManager::getSingleton().initTechniques();

GTP/trunk/App/Demos/Illum/Ogre/src/CausticTest/scripts/CausticTest.vcproj

@@ -219 +219 @@
                         </File>
                         <File
+                                RelativePath="..\..\..\Media\materials\programs\GameTools_Blur.hlsl"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\..\Media\materials\programs\GameTools_Cau.hlsl"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\..\Media\materials\programs\GameTools_CauCube.hlsl"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\..\Media\materials\programs\GameTools_Caustic.hlsl"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\..\Media\materials\programs\GameTools_Localized_EnvMap.hlsl"
                                 >
                         </File>

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

@@ -319 +319 @@
         void createPostproc()
         {
-                CompositorManager::getSingleton().addCompositor(mWindow->getViewport(0),
+                /*CompositorManager::getSingleton().addCompositor(mWindow->getViewport(0),
                                                                                                                 "GameTools/Glow");
                 CompositorManager::getSingleton().setCompositorEnabled(mWindow->getViewport(0),
-                                                                                                                "GameTools/Glow", true);
+                                                                                                                "GameTools/Glow", true);*/
+
+                CompositorManager::getSingleton().addCompositor(mWindow->getViewport(0),
+                                                                                                                "GameTools/ToneMap");
+                CompositorManager::getSingleton().setCompositorEnabled(mWindow->getViewport(0),
+                                                                                                                "GameTools/ToneMap", true);             
 
         }
@@ -330 +335 @@
     {
 
-                //createPostproc();
+                createPostproc();
                 
                 OgreIlluminationManager::getSingleton().setMainCamera(mCamera);

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

@@ -177 +177 @@
     {
 
-                createPostproc();
+                //createPostproc();
                 
                 OgreIlluminationManager::getSingleton().setMainCamera(mCamera);
@@ -266 +266 @@
                 //Init lights
                 mainLight = mSceneMgr->createLight("MainLight");
-                mainLight->setType(Light::LT_SPOTLIGHT);
+                mainLight->setType(Light::LT_POINT);
         mainLight->setDiffuseColour(ColourValue::White);
                 mainLight->setSpecularColour(ColourValue::White);
-                mainLight->setSpotlightRange(Radian(Degree(175)),Radian(Degree(180)));
+                //mainLight->setSpotlightRange(Radian(Degree(175)),Radian(Degree(180)));
                 mainLightNode = rootNode->createChildSceneNode();
                 mainLightNode->setPosition(0,0,0);              

GTP/trunk/App/Demos/Illum/Ogre/src/GameToolsRaytraceDemo/scripts/GameToolsRaytraceDemo.vcproj

@@ -231 +231 @@
                                 >
                         </File>
+                        <File
+                                RelativePath="..\..\..\Media\materials\scripts\kupola.material"
+                                >
+                        </File>
                 </Filter>
         </Files>