Changeset 2509 for GTP/trunk/App

Timestamp:

07/03/07 15:49:39 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• ShadowDemo/include/ShadowDemo.h (modified) (5 diffs)
• ShadowDemo/scripts/ShadowDemo.7.10.vcproj (modified) (3 diffs)
• ShadowDemo/src/ShadowDemo.cpp (modified) (1 diff)
• SpaceStation/include/SpaceStation.h (modified) (2 diffs)

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

@@ -93 +93 @@
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Basic");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("PostProc");
-                ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_PathMap");
-                ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_PathMapDemo");
+                //ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_PathMap");
+                //ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_PathMapDemo");
                 ResourceGroupManager::getSingleton().initialiseResourceGroup("GTP_Demo_Towers");
         }
@@ -176 +176 @@
                 OgreIlluminationManager::getSingleton().initTechniques();
    }*/
-/*
+
         void createScene(void) ///TOWERS
     {
@@ -190 +190 @@
                 OgreIlluminationManager::getSingleton().setFocusingSM(true);
            OgreIlluminationManager::getSingleton().setBlurShadowMap(true);
-           OgreIlluminationManager::getSingleton().setUseLISPSM(false);
+           OgreIlluminationManager::getSingleton().setUseLISPSM(true);
                                 
                 Root::getSingleton()._setCurrentSceneManager(mSceneMgr);
-                mCamera->setPosition(0,0,0);
+                mCamera->setPosition(-10,20,-20);
                 //mCamera->setPosition(0,100,0);
-                //mCamera->lookAt(0,-1,0);
+                mCamera->lookAt(10,0,20);
                 mCamera->setFOVy(Radian(Degree(80)));
                 mCamera->setNearClipDistance(0.01);
@@ -227 +227 @@
                 
                 OgreIlluminationManager::getSingleton().initTechniques();
-   }*/
-
+   }
+/*
         void createScene(void) ///PATHMAP Hangar
         { 
@@ -305 +305 @@
                 OgreIlluminationManager::getSingleton().initTechniques();
    }
-        
+*/      
         void createPlane(Ogre::String _name, Ogre::String _material, Ogre::Vector3 _pos, Ogre::Vector2 _size, Ogre::Vector2 _subdivisions = Ogre::Vector2(1,1)) 
         {

GTP/trunk/App/Demos/Illum/Ogre/src/ShadowDemo/scripts/ShadowDemo.7.10.vcproj

@@ -36 +36 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="OgreMain_d.lib IllumModule_Ogre.lib IllumModule.lib"
-                                OutputFile="$(OutDir)/PRMDemo.exe"
+                                OutputFile="$(OutDir)/ShadowMapDemo.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)/PRMDemo.exe"
+                                OutputFile="$(OutDir)/ShadowMapDemo.exe"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\bin\Release;"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\bin\Release"
@@ -140 +140 @@
                         Name="Source Files"
                         Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+                        <File
+                                RelativePath="..\src\ShadowDemo.cpp">
+                        </File>
                 </Filter>
                 <Filter
                         Name="Header Files"
                         Filter="h;hpp;hxx;hm;inl;inc">
+                        <File
+                                RelativePath="..\include\ShadowDemo.h">
+                        </File>
                 </Filter>
                 <Filter

GTP/trunk/App/Demos/Illum/Ogre/src/ShadowDemo/src/ShadowDemo.cpp

@@ -27 +27 @@
 #endif
 
-#include "PRMDemo.h"
+#include "ShadowDemo.h"
 
 #ifdef __cplusplus

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

@@ -107 +107 @@
                         animState->setEnabled(true);
                         animState->setLoop(true);
+                        
+                        Vector3 look = FPSPlayer::thePlayer->getPosition() - pos;
+                        look.y = 0;
+                        look.normalise();
+                        Vector3 right = -look.crossProduct(Vector3::UNIT_Y);
+                        Quaternion q;                   
+                        q.FromAxes(right,Vector3::UNIT_Y, look);
+                        mNode->setOrientation(q);
+
                 }
                                 
@@ -112 +121 @@
                 {
                         //move forward to target
-                        mNode->translate(movespeed * 0.1 * Vector3(0,0,1), Node::TS_LOCAL);
+                        mNode->translate(movespeed * evt.timeSinceLastFrame * 2 * Vector3(0,0,1), Node::TS_LOCAL);
                 }
                 else