Changeset 1423

Timestamp:

09/21/06 08:34:44 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• include/HierarchicalSystem.h (modified) (6 diffs)
• scripts/HierarchicalSystem.vcproj (modified) (3 diffs)

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

@@ -33 +33 @@
         
         unsigned long framecount;
-        
+        SceneNode* lightNode;
+
 public:
-    ParticleDemoFrameListener(RenderWindow* window, Camera* maincam)
+    ParticleDemoFrameListener(RenderWindow* window, Camera* maincam, SceneNode* lightNode)
         :ExampleFrameListener(window, maincam) 
                                  
     {
+                this->lightNode = lightNode;
                 framecount = 0;         
     }
@@ -45 +47 @@
     {           
                 bool result = ExampleFrameListener::frameStarted(evt);
+                
+                float t = (float) framecount / 50.0;
+                float r = 150;
+                lightNode->setPosition( r * sin(t), r * sin(5 * t) , r * cos(t));
+
        framecount++;
         return result;     
@@ -122 +129 @@
                                 
                 Root::getSingleton()._setCurrentSceneManager(mSceneMgr);
-                mCamera->setPosition(0,100,240);
+                mCamera->setPosition(0,0,100);
+                mCamera->setDirection(0,0,-1);
                 mCamera->setFOVy(Radian(Degree(80)));
-                //mCamera->setFarClipDistance(1000);
+                mCamera->setFarClipDistance(1000);
                 // Set ambient light
         mSceneMgr->setAmbientLight(ColourValue(1, 1, 1));
 
                 // Skybox
-        mSceneMgr->setSkyBox(true, "Examples/MorningSkyBox");
+        mSceneMgr->setSkyBox(true, "Examples/MorningSkyBox", 10);
                 SceneNode* rootNode = mSceneMgr->getRootSceneNode();
-                
-                
-                ParticleSystem* pSys1 = mSceneMgr->createParticleSystem("psys1", "GameTools/Big");
-                pSys1->setKeepParticlesInLocalSpace(false);
-                SceneNode *pSysNode = rootNode->createChildSceneNode();
-                pSysNode->attachObject(pSys1); 
-
-                pSysNode->setPosition(0,1,0);
-        /*              
-      
+                                        
+      /*
                 //init objects
                 Entity* kupola = mSceneMgr->createEntity("kupola", "kupola.mesh");              
-                Entity* head = mSceneMgr->createEntity("head", "ogrehead.mesh");
                                 
                 //init nodes
@@ -152 +151 @@
                 kupolaNode->_updateBounds();
                 MeshPtr kmesh = kupola->getMesh();
-                kmesh->buildTangentVectors(0,1);
-                
+                kmesh->buildTangentVectors(0,1);*/
+                
+                Entity* head = mSceneMgr->createEntity("head", "ogrehead.mesh");
                 SceneNode* headNode = rootNode->createChildSceneNode("head");
                 headNode->attachObject(head);
-                headNode->setScale(2,2,2);
+                //headNode->setScale(0.5,0.5,0.5);
                 AxisAlignedBox bbox = head->getBoundingBox();
-                headNode->setPosition(0, 100,0);                
+                headNode->setPosition(0,0,0);           
                 headNode->_updateBounds();
-                
-
+
+                /*Entity* head2 = mSceneMgr->createEntity("head2", "ogrehead.mesh");
+                SceneNode* headNode2 = rootNode->createChildSceneNode("head2");
+                headNode2->attachObject(head2);
+                headNode2->setScale(2,2,2);
+                headNode2->setPosition(0, 0, 0);*/
+
+                ParticleSystem* pSys1 = mSceneMgr->createParticleSystem("psys1", "GameTools/Big");
+                pSys1->setKeepParticlesInLocalSpace(false);
+                SceneNode *pSysNode = rootNode->createChildSceneNode("psys1");
+                pSysNode->attachObject(pSys1); 
+
+                pSysNode->setPosition(0,0,0);
+                
                 //Init lights
                 Light* mainLight = mSceneMgr->createLight("MainLight");
@@ -168 +180 @@
                 mainLight->setSpecularColour(ColourValue::White);
                 mainLightNode = rootNode->createChildSceneNode();
-                mainLightNode->setPosition(0,150,0);
+                mainLightNode->setPosition(0,500,0);
                 mainLight->setPosition(mainLightNode->getWorldPosition());
                 mainLightNode->attachObject(mainLight); 
-        */      
-        
+                BillboardSet* bbs = mSceneMgr->createBillboardSet("bb", 1);
+                bbs->createBillboard(Vector3::ZERO, ColourValue::White);
+                bbs->setMaterialName("Flare");
+                mainLightNode->attachObject(bbs);
+
+        //      OgreIlluminationManager::getSingleton().createGlobalRun(ILLUMRUN_PHASE_TEXTURE);
+        //      OgreIlluminationManager::getSingleton().updateGlobalRun(ILLUMRUN_PHASE_TEXTURE, 1);
+        //      OgreIlluminationManager::getSingleton().savePhaseTextureToFile("phase.dds");
 
                 OgreIlluminationManager::getSingleton().initTechniques();
@@ -182 +200 @@
                 // This is where we instantiate our own frame listener
                 mFrameListener= new ParticleDemoFrameListener(mWindow,
-                                                                                        mCamera );
+                                                                                        mCamera , mainLightNode);
         mRoot->addFrameListener(mFrameListener);
 

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

@@ -36 +36 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="OgreMain_d.lib IllumModule_Ogre.lib IllumModule.lib"
-                                OutputFile="$(OutDir)/GameToolsParticleDemo.exe"
+                                OutputFile="$(OutDir)/HPSDemo.exe"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\bin\Debug;"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\bin\Debug"
@@ -102 +102 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="OgreMain.lib IllumModule_Ogre.lib IllumModule.lib"
-                                OutputFile="$(OutDir)/HPS.exe"
+                                OutputFile="$(OutDir)/HPSDemo.exe"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\bin\Release;"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\bin\Release"
@@ -164 +164 @@
                         </File>
                         <File
+                                RelativePath="..\..\..\Media\materials\programs\GameTools_HPS_Smoke_L_Depth.hlsl">
+                        </File>
+                        <File
                                 RelativePath="..\..\..\Media\materials\programs\GameTools_HPS_Smoke_S.hlsl">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\Media\materials\programs\GameTools_Smoke_IllumVolume.hlsl">
                         </File>
                         <File