Changeset 2405

Timestamp:

06/05/07 01:59:59 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• Common/include/FPSPlayer.h (added)
• Common/src/FPSPlayer.cpp (added)
• Moria/include/Moria.h (modified) (8 diffs)
• PRMDemo/include/PRMDemo.h (modified) (5 diffs)

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

@@ -28 +28 @@
 #include "FPSPlayer.h"
 
-AnimationState* mAnimState;
+AnimationState* mAnimState = 0;
 bool cullCamera = true;
 Body *throwSphere = 0;
@@ -69 +69 @@
                 framecount++;
           
-            mAnimState->addTime(evt.timeSinceLastFrame * 0.5);  
+//          mAnimState->addTime(evt.timeSinceLastFrame * 1.0);  
                 
 
@@ -119 +119 @@
             mTimeUntilNextToggle = 1;
         }
+                if (mInputDevice->isKeyDown(KC_SYSRQ) && mTimeUntilNextToggle <= 0)
+        {
+                        char tmp[20];
+                        sprintf(tmp, "screenshot_%d.png", ++mNumScreenShots);
+            mWindow->writeContentsToFile(tmp);
+            mTimeUntilNextToggle = 0.5;
+                        mWindow->setDebugText(String("Wrote ") + tmp);
+        }
                 return true;
         }
@@ -148 +156 @@
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Basic");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("General");
+                ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_EnvMap");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("PostProc");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Particles");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_PathMap");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Moria");              
-                //ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_EnvMap");
                 //ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Caustic");
         }
@@ -289 +297 @@
                 bbs->setMaterialName("Flare");
                 mainLightNode->attachObject(bbs);
-
+/*
                     Entity* ent = mSceneMgr->createEntity("troll", "troll.mesh");
                         ent->setCastShadows(true);
@@ -296 +304 @@
                         trollNode->attachObject(ent);
                         trollNode->setScale(0.05,0.05,0.05);
-            mAnimState = ent->getAnimationState("stand");
-            mAnimState->setEnabled(true);
-
-                gFPSPlayer = new FPSPlayer(NXScene, mSceneMgr, Vector3(0.5, 1.8, 0.3), Vector3(15, 1, 15), 1.6, mCamera, false);
-                gFPSPlayer->addPlayerMesh("FPSarm.mesh", 0.02, true);
-                gFPSPlayer->addWeaponModel("sword.mesh", "joint28");
-
+            mAnimState = ent->getAnimationState("walk");
+            mAnimState->setEnabled(true);*/
+
+//              PlayerCharacter::frameListenerPriority = 20;
+                gFPSPlayer = new FPSPlayer(NXScene, mSceneMgr, Vector3(0.5, 1.8, 0.3), Vector3(5, 10, 15), 1.6, mCamera, false);
+                //gFPSPlayer->addPlayerMesh("FPSarm.mesh", 0.02, true);
+                //gFPSPlayer->addWeaponModel("sword.mesh", "joint28");
+/*
+                PlayerCharacter* troll = new PlayerCharacter("troll1", NXScene, mSceneMgr, Vector3(1.5, 3.0, 1.2), Vector3(5, 10, 5), false);
+                troll->addPlayerMesh("troll.mesh", 0.05, false);*/
                 for(float i = 0; i< 7; i++)
                 {
@@ -312 +323 @@
                         Body* b = NXScene->createBody("cube.mesh",
                                                                 new CubeShape(size, size, size),
-                                                                Vector3(3,size/2.0 + size * (i + 0.01),3),
+                                                                Vector3(3,size/2.0 + i * 5.0,3),
                                                                 ac);
                         b->setCharacterCollisionGroup(NX_CHARACTER_COL_GROUP_PUSHABLE);
@@ -354 +365 @@
         mFrameListener->setPriority(10);        
                 mRoot->addFrameListener(mFrameListener);
-                gFPSPlayer->setPriority(20);
-            mRoot->addFrameListener(gFPSPlayer);
-                OgreIlluminationManager::getSingleton().setPriority(30);
+//              gFPSPlayer->setPriority(20);
+//              mRoot->addFrameListener(gFPSPlayer);
+                OgreIlluminationManager::getSingleton().setPriority(40);
             mRoot->addFrameListener(&OgreIlluminationManager::getSingleton());
           

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

@@ -26 +26 @@
 #include "SceneSerializer.h"
 
+Light* blueLight;
 
 // Listener class for frame updates
@@ -54 +55 @@
                 bool result = ExampleFrameListener::frameStarted(evt);
        framecount++;
+
+           static float t = 0;
+           float dt = evt.timeSinceLastFrame / 4.0;
+           t += dt;
+
+           //blueLight->setDirection(sin(t),sin(t),cos(t));
+           blueLight->getParentSceneNode()->setPosition(30 * sin(t), 1, 30 * cos(t));
           
         return result;     
@@ -81 +89 @@
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Basic");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("PostProc");
-                //ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Demo");
+                ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_PathMap");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_PathMapDemo");
         }
@@ -225 +233 @@
                 OgreIlluminationManager::getSingleton().setMainCamera(mCamera);
                 OgreIlluminationManager::getSingleton().setMainViewport(mWindow->getViewport(0));
-                OgreIlluminationManager::getSingleton().setShadowMapSize(512);
-                OgreIlluminationManager::getSingleton().setShadowMapMaterialName("GTP/Basic/Distance_Normalized");
+                OgreIlluminationManager::getSingleton().setShadowMapMaterialName(Light::LT_SPOTLIGHT, "GTP/Basic/Distance_Normalized");
+                OgreIlluminationManager::getSingleton().setShadowMapMaterialName(Light::LT_POINT, "GTP/Basic/Distance_Normalized");
                 OgreIlluminationManager::getSingleton().setFocusingSM(false);
            OgreIlluminationManager::getSingleton().setShadowMapSize(512);
@@ -253 +261 @@
                         
                 //createPlane("p","GTP/Basic/ShadowReceiver/Depth",Vector3(0,-0.3,0),Vector2(150,150));
-
+/*
                 mainLight = mSceneMgr->createLight("MainLight");
                 mainLight->setType(Light::LT_SPOTLIGHT);
-                mainLight->setCastShadows(false);
-        mainLight->setDiffuseColour(ColourValue(0.5,0.8,1,1));
+                mainLight->setCastShadows(true);
+        mainLight->setDiffuseColour(ColourValue(1.0,0.5,0.3,1));
                 mainLight->setSpecularColour(ColourValue::White);
                 mainLightNode = rootNode->createChildSceneNode();
                 
                 mainLightNode->setPosition(30,1,0.0);           
-                mainLight->setPosition(30,0,0);
-                mainLight->setPowerScale(300);
+                //mainLight->setPosition(30,1,0);
+                mainLight->setPowerScale(200);
                 mainLight->setDirection(-1, 0, 0);
                 mainLight->setSpotlightOuterAngle(Radian(Degree(90)));
-                mainLight->setAttenuation(50, 0, 1, 0);
+                mainLight->setAttenuation(200, 0, 0, 1);
                 mainLightNode->attachObject(mainLight);         
-
-
-
-
-                Light* blueLight = mSceneMgr->createLight("BlueLight");
-                blueLight->setType(Light::LT_SPOTLIGHT);
-                blueLight->setCastShadows(false);
-        blueLight->setDiffuseColour(ColourValue(0.0,0.1,1,1));
+*/
+                blueLight = mSceneMgr->createLight("BlueLight");
+                blueLight->setType(Light::LT_POINT);
+                blueLight->setCastShadows(true);
+        blueLight->setDiffuseColour(ColourValue(1,1,1,1));
                 blueLight->setSpecularColour(ColourValue::White);
                 SceneNode* blueLightNode = rootNode->createChildSceneNode();
                 
                 blueLightNode->setPosition(-30,1,0.0);          
-                blueLight->setPosition(-30,0,0);
-                blueLight->setPowerScale(300);
-                blueLight->setDirection(1, 0, 0);
-                blueLight->setSpotlightOuterAngle(Radian(Degree(90)));
-                blueLight->setAttenuation(50, 0, 1, 0);
+                //blueLight->setPosition(-30,1,0);
+                blueLight->setPowerScale(200);
+        //      blueLight->setDirection(1, 0, 0);
+        //      blueLight->setSpotlightOuterAngle(Radian(Degree(90)));
+                blueLight->setAttenuation(200, 0, 0, 1);
                 blueLightNode->attachObject(blueLight);