Changeset 3220

Timestamp:

12/10/08 15:57:06 (16 years ago)

Author:

mattausch

Message:

worked on video replay function

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• IrradianceMapping.vcproj (modified) (3 diffs)
• VboFormatConverter.vcproj (modified) (1 diff)
• default.env (modified) (2 diffs)
• src/DeferredRenderer.cpp (modified) (3 diffs)
• src/DeferredRenderer.h (modified) (2 diffs)
• src/Environment.cpp (modified) (1 diff)
• src/Environment.h (modified) (2 diffs)
• src/WalkThroughRecorder.cpp (modified) (3 diffs)
• src/WalkThroughRecorder.h (modified) (3 diffs)
• src/chcdemo.cpp (modified) (6 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/IrradianceMapping.vcproj

@@ -41 +41 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
+                                AdditionalIncludeDirectories="libs;src;libs/GL;libs/Devil/include;libs/Zlib/include;"$(CG_INC_PATH)""
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 MinimalRebuild="true"
@@ -61 +62 @@
                         <Tool
                                 Name="VCLinkerTool"
+                                AdditionalDependencies="DemoEngine.lib glut32.lib glew32s.lib glew32.lib DevIL.lib ILUT.lib zlib.lib cg.lib cgGL.lib"
                                 LinkIncremental="2"
+                                AdditionalLibraryDirectories="&quot;lib/$(ConfigurationName)&quot;;libs;&quot;$(CG_LIB_PATH)&quot;;libs/GL;libs/Devil/lib;libs/Zlib/lib"
+                                IgnoreDefaultLibraryNames="LIBCMT"
                                 GenerateDebugInformation="true"
                                 SubSystem="1"
@@ -121 +125 @@
                                 OmitFramePointers="true"
                                 EnableFiberSafeOptimizations="true"
-                                AdditionalIncludeDirectories="libs;libs/GL;libs/Devil/include;src;libs/Zlib/include;&quot;$(CG_INC_PATH)&quot;"
+                                AdditionalIncludeDirectories="libs;src;libs/GL;libs/Devil/include;libs/Zlib/include;&quot;$(CG_INC_PATH)&quot;"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE; _CRT_SECURE_NO_WARNINGS"
                                 RuntimeLibrary="2"

GTP/trunk/App/Demos/Vis/FriendlyCulling/VboFormatConverter.vcproj

@@ -18 +18 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="$(SolutionDir)$\VboFormatConverter\(ConfigurationName)"
+                        IntermediateDirectory="$(ConfigurationName)\VboFormatConverter"
                         ConfigurationType="1"
                         CharacterSet="1"

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -3 +3 @@
 #####################################################
 
+
+################
+# misc stuff
+
+useLODs=1
+shadowSize=4096
+# the filenames given to recorded frames (+ number.bmp)
+recordedFramesSuffix=image
 
 
@@ -15 +23 @@
 maxDepthForTestingChildren=3
 
-################
-
-useLODs=1
-shadowSize=4096
 
 ####################

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

@@ -333 +333 @@
 mSampleIntensity(0.2f),
 mSunVisiblePixels(0),
-mSavedFrameNumber(-1)
+mSavedFrameNumber(-1),
+mSavedFrameSuffix("")
 {
         ///////////
@@ -1326 +1327 @@
 
         static char imageName[200];
-        sprintf(imageName, "myframe%05d.bmp", mSavedFrameNumber);
+        sprintf(imageName, "%s_%05d.bmp", mSavedFrameSuffix.c_str(), mSavedFrameNumber);
 
         ILstring fileName = ILstring(imageName);
@@ -1422 +1423 @@
 
 
-void DeferredRenderer::SetSaveFrame(int frameNumber)
-{
+void DeferredRenderer::SetSaveFrame(const string &suffix, int frameNumber)
+{
+        mSavedFrameSuffix = suffix;
         mSavedFrameNumber = frameNumber;
 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.h

@@ -86 +86 @@
                 using the specified frame number
         */
-        void SetSaveFrame(int frameNumber);
+        void SetSaveFrame(const std::string &suffix, int frameNumber);
 
 
@@ -202 +202 @@
 
         int mSavedFrameNumber;
+        std::string mSavedFrameSuffix;
 };
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Environment.cpp

@@ -69 +69 @@
 
 
+bool Environment::GetStringParam(std::string &str, string &val) const
+{
+        map<string, string>::const_iterator it = mParams.find(str);
+
+        if (it == mParams.end()) // parameter not found
+                return false;
+        
+        // just assign value as it is - the line break character
+        val = (*it).second;
+        val.erase(val.end() - 1);
+
+        return true;
+}
+
+
 bool Environment::Read(const string &filename)
 {

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Environment.h

@@ -16 +16 @@
 
 /** Loads startup environment for the demo
+        Options are stored as name / value pair
 */
 class Environment
@@ -25 +26 @@
         bool Read(const std::string &filename);
 
-        bool GetFloatParam(std::string &str, float &val) const;
-        bool GetIntParam(std::string &str, int &val) const;
-        bool GetVectorParam(std::string &str, Vector3 &val) const;
-        bool GetBoolParam(std::string &str, bool &val) const;
+        bool GetFloatParam(std::string &name, float &val) const;
+        bool GetIntParam(std::string &name, int &val) const;
+        bool GetVectorParam(std::string &name, Vector3 &val) const;
+        bool GetBoolParam(std::string &name, bool &val) const;
+        bool GetStringParam(std::string &name, std::string &val) const;
+
 
 protected:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/WalkThroughRecorder.cpp

@@ -17 +17 @@
 
 
+WalkThroughRecorder::~WalkThroughRecorder()
+{
+        mFile.close();
+}
+
+
 void WalkThroughRecorder::WriteFrame(Camera *cam)
 {
@@ -28 +34 @@
 {
         ifstream file(filename.c_str());
-        FrameInfo info;
-        int i=0;
 
-        std::string token;
+        if (file.is_open())
+        {
+                FrameInfo info;
+                int i=0;
 
-        while(std::getline(file, token)) 
+                std::string token;
+
+                while(std::getline(file, token)) 
+                {
+                        std::stringstream line(token);
+
+                        line >> info;
+                        mFrameInfos.push_back(info);
+                }
+        }
+        else
         {
-                std::stringstream line(token);
+                cerr << "problem: cannot open file " << filename << endl;
+        }
 
-                line >> info;
-                mFrameInfos.push_back(info);
-        }
+        file.close();
 }
 
@@ -45 +61 @@
 bool WalkThroughPlayer::ReadNextFrame(Camera *cam)
 {
+        if (mFrameInfos.empty())
+                return false;
+
         cam->SetDirection(mFrameInfos[mFrame].mDirection);
         cam->SetPosition(mFrameInfos[mFrame].mPosition);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/WalkThroughRecorder.h

@@ -31 +31 @@
 
 
-// Overload << operator for C++-style output
+/// Overload << operator for C++-style output
 inline std::ostream& operator<< (std::ostream &s, const FrameInfo &A)
 {
@@ -38 +38 @@
 
 
-// Overload >> operator for C++-style input
+/// Overload >> operator for C++-style input
 inline std::istream& operator>> (std::istream &s, FrameInfo &A)
 {
         return s >> A.mPosition >> A.mDirection;
 }
-
 
 
@@ -54 +53 @@
         */
         WalkThroughRecorder(const std::string &filename);
+
+        ~WalkThroughRecorder();
+
         /** Writes current camera data.
         */
         void WriteFrame(Camera *cam);
         
+
 protected:
 
         std::ofstream mFile;
 };
+
 
 /** Replays a given walkthrough

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -122 +122 @@
 int currentReplayFrame = -1;
 
+string recordedFramesSuffix("frames");
+
 /// the walkThroughRecorder
 WalkThroughRecorder *walkThroughRecorder = NULL;
@@ -416 +418 @@
                 env.GetFloatParam(string("ssaoKernelRadius"), ssaoKernelRadius);
                 env.GetFloatParam(string("ssaoSampleIntensity"), ssaoSampleIntensity);
-
                 env.GetBoolParam(string("ssaoUseFullResolution"), ssaoUseFullResolution);
+
+                env.GetStringParam(string("recordedFramesSuffix"), recordedFramesSuffix);
 
                 //env.GetStringParam(string("modelPath"), model_path);
@@ -446 +449 @@
                 cout << "kernel radius: " << ssaoKernelRadius << endl;
                 cout << "ssao full resolution: " << ssaoUseFullResolution << endl;
+                cout << "recorded frames suffix: " << recordedFramesSuffix << endl;
 
                 //cout << "model path: " << model_path << endl;
@@ -511 +515 @@
         resourceManager = ResourceManager::GetSingleton();
         shaderManager = ShaderManager::GetSingleton();
+
 
         ///////////
@@ -1261 +1266 @@
                 deferredShader->SetUseTemporalCoherence(useTemporalCoherence);
                 deferredShader->SetSortSamples(sortSamples);
-                deferredShader->SetSaveFrame((recordFrames && replayPath) ? -1 : currentReplayFrame);
+                deferredShader->SetSaveFrame(recordedFramesSuffix, (recordFrames && replayPath) ? currentReplayFrame : -1);
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
@@ -1490 +1495 @@
         case 'u':
         case 'U':
+                // move light source instead of camera tilt
                 moveLight = !moveLight;
                 break;