Changeset 2418

Timestamp:

06/06/07 19:19:42 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• Common/include/FPSPlayer.h (modified) (1 diff)
• Common/src/FPSPlayer.cpp (modified) (2 diffs)
• Moria/include/Moria.h (modified) (5 diffs)

GTP/trunk/App/Demos/Illum/Ogre/src/Common/include/FPSPlayer.h

@@ -62 +62 @@
         bool mDebug;
 
-        virtual String getAnimStateName(PlayerAnimState as,  int option = 0){return "walk";}
+        virtual String getAnimStateName(PlayerAnimState as,  int option = 0){return "stand";}
         virtual void setAnimState(PlayerAnimState as)
         {

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

@@ -95 +95 @@
 {
         mCharacterMeshEntity = mSceneManager->createEntity(mName, meshname);
-        mCharacterMeshEntity->setCastShadows(true);
+        mCharacterMeshEntity->setCastShadows(false);
         mMeshScale = meshscale;
         mCurrentAnimState = PLAYERANIMSTATE_STAND;
@@ -242 +242 @@
                         if(mCharacterController )
                         ((MyCharMoveController*)mCharacterController)->movespeed = 1.5;
-                        mPlayerCharacter->addMovement(Character::DR_StepRight);
+                        //mPlayerCharacter->addMovement(Character::DR_StepRight);
                 //}
 
         }
-        if(mCharacterMeshEntity)
-        setAnimState(PLAYERANIMSTATE_WALK);
+        //if(mCharacterMeshEntity)
+        //setAnimState(PLAYERANIMSTATE_WALK);
 }
 

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

@@ -70 +70 @@
                 float thisTime = (float) Root::getSingleton().getTimer()->getMilliseconds() / 2000.0f;
                 thisTime= 0;
-                mainLightNode->setPosition(Vector3(2*cos(thisTime), 2, 2 * sin(thisTime)) + Vector3(5, 0, 5));
+                //mainLightNode->setPosition(Vector3(2*cos(thisTime), 2, 2 * sin(thisTime)) + Vector3(5, 0, 5));
                 Vector3 pos = light->getDerivedPosition();
                 pos.normalise();
@@ -170 +170 @@
                         mTimeUntilNextToggle = 0.2;
                 }
+
+                if (mInputDevice->isKeyDown(KC_I))
+                {
+                        light->getParentSceneNode()->setPosition(
+                                light->getParentSceneNode()->getPosition()
+                                + Vector3(0.2,0,0));
+                }
+                if (mInputDevice->isKeyDown(KC_K))
+                {
+                        light->getParentSceneNode()->setPosition(
+                                light->getParentSceneNode()->getPosition()
+                                + Vector3(-0.2,0,0));
+                }
+                if (mInputDevice->isKeyDown(KC_J))
+                {
+                        light->getParentSceneNode()->setPosition(
+                                light->getParentSceneNode()->getPosition()
+                                + Vector3(0,0,0.2));
+                }
+                if (mInputDevice->isKeyDown(KC_L))
+                {
+                        light->getParentSceneNode()->setPosition(
+                                light->getParentSceneNode()->getPosition()
+                                + Vector3(0,0,-0.2));
+                }
+                
         
                 
@@ -290 +316 @@
                 //mCamera->setPosition(0,100,0);
                 //mCamera->lookAt(0,-1,0);
-                mCamera->setFOVy(Radian(Degree(90)));
+                mCamera->setFOVy(Radian(Degree(100)));
                 mCamera->setNearClipDistance(0.001);
                 mCamera->setFarClipDistance(150);
@@ -351 +377 @@
                 mainLightNode->attachObject(mainLight);
                 //mainLight->setSpotlightRange(Degree(0),Degree(120));
-                mainLight->setAttenuation(200.0, 0, 0, 2);
+                mainLight->setAttenuation(200.0, 0, 0, 1);
 /*
                 Light* blueLight = mSceneMgr->createLight("blueLight");
@@ -385 +411 @@
                 gFPSPlayer->addWeaponModel("sword.mesh", "joint28");
 
-                PlayerCharacter* troll = new PlayerCharacter("troll1", NXScene, mSceneMgr, Vector3(1.5, 3.0, 1.2), Vector3(5, 10, 5), false);
+                PlayerCharacter* troll = new PlayerCharacter("troll1", NXScene, mSceneMgr, Vector3(1.5, 3.0, 1.2), Vector3(15, 10, 15), false);
                 troll->addPlayerMesh("troll.mesh", 0.05, false);
 /*