Changeset 2405 for GTP/trunk/App/Demos/Illum/Ogre/src/Moria/include

Timestamp:

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

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/Ogre/src/Moria/include/Moria.h (modified) (8 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());