[Ogreaddons-svnmail] SF.net SVN: ogreaddons:[2975] trunk/stereoscopy

[<m_...@us...>]

Revision: 2975
          http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2975&view=rev
Author:   m_leber
Date:     2010-09-20 09:30:50 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
Updated build configuration

Modified Paths:
--------------
    trunk/stereoscopy/Demo_Fresnel/Fresnel.cpp
    trunk/stereoscopy/StereoManager.cpp
    trunk/stereoscopy/ogre1.6.vsprops
    trunk/stereoscopy/ogre1.7.vsprops

Modified: trunk/stereoscopy/Demo_Fresnel/Fresnel.cpp
===================================================================
--- trunk/stereoscopy/Demo_Fresnel/Fresnel.cpp	2010-09-18 16:28:00 UTC (rev 2974)
+++ trunk/stereoscopy/Demo_Fresnel/Fresnel.cpp	2010-09-20 09:30:50 UTC (rev 2975)
@@ -319,7 +319,7 @@
 			// get the resolution choosen with the config dialog
 			ConfigOptionMap options = mRoot->getRenderSystem()->getConfigOptions();
 			String mode = options.find( "Video Mode" )->second.currentValue;
-			std::vector<String> tab = StringUtil::split(mode," x@");
+			StringVector tab = StringUtil::split(mode," x@");
 			int w,h;
 			w = StringConverter::parseInt(tab[0]);
 			h = StringConverter::parseInt(tab[1]);

Modified: trunk/stereoscopy/StereoManager.cpp
===================================================================
--- trunk/stereoscopy/StereoManager.cpp	2010-09-18 16:28:00 UTC (rev 2974)
+++ trunk/stereoscopy/StereoManager.cpp	2010-09-20 09:30:50 UTC (rev 2975)
@@ -55,7 +55,9 @@
 	if(evt.source != mViewport)
 		return;
 	mCamera = mViewport->getCamera();
-	assert(mCamera);
+	if(!mCamera)
+		return;
+
 	mStereoMgr->setCamera(mCamera);
 
 	SceneManager *sceneMgr = mCamera->getSceneManager();
@@ -94,9 +96,9 @@
 	// update position
 	mOldPos = mCamera->getPosition();
 	Vector3 pos = mOldPos;
-	
 	pos += offset * mCamera->getRight();
 	mCamera->setPosition(pos);
+//	mCamera->moveRelative(Vector3(offset, 0, 0));
 
 	mStereoMgr->updateAllDependentRenderTargets(mIsLeftEye);
 	mStereoMgr->chooseDebugPlaneMaterial(mIsLeftEye);
@@ -107,6 +109,8 @@
 	if(evt.source != mViewport)
 		return;
 
+	
+
 	if(!mStereoMgr->mIsCustomProjection)
 		mCamera->setFrustumOffset(mOldOffset);
 	else

Modified: trunk/stereoscopy/ogre1.6.vsprops
===================================================================
--- trunk/stereoscopy/ogre1.6.vsprops	2010-09-18 16:28:00 UTC (rev 2974)
+++ trunk/stereoscopy/ogre1.6.vsprops	2010-09-20 09:30:50 UTC (rev 2975)
@@ -14,11 +14,16 @@
 	/>
 	<Tool
 		Name="VCPostBuildEventTool"
-		CommandLine="if exist $(OGRE_SRC) copy &quot;$(TargetPath)&quot; &quot;$(OGRE_SRC)\Samples\Common\Bin\$(ConfigurationName)&quot;"
+		CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(OGRE_BIN)&quot;"
 	/>
 	<UserMacro
 		Name="OGRE_SRC"
 		Value="D:\dev\okatra\ogre1.6.4"
 		PerformEnvironmentSet="true"
 	/>
+	<UserMacro
+		Name="OGRE_BIN"
+		Value="$(OGRE_SRC)\Samples\Common\Bin\$(ConfigurationName)"
+		PerformEnvironmentSet="true"
+	/>
 </VisualStudioPropertySheet>

Modified: trunk/stereoscopy/ogre1.7.vsprops
===================================================================
--- trunk/stereoscopy/ogre1.7.vsprops	2010-09-18 16:28:00 UTC (rev 2974)
+++ trunk/stereoscopy/ogre1.7.vsprops	2010-09-20 09:30:50 UTC (rev 2975)
@@ -6,11 +6,11 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(OGRE_SRC)\OgreMain\include&quot;;&quot;$(OGRE_SRC)\Dependencies\include&quot;;&quot;$(OGRE_SRC)\Samples\Common\include&quot;;&quot;$(OGRE_BUILD)\include&quot;"
+		AdditionalIncludeDirectories="&quot;$(OGRE_HOME)\include\OGRE&quot;;&quot;$(OGRE_HOME)\include&quot;;&quot;$(OGRE_HOME)\Samples\Common\include&quot;;&quot;C:\Program Files (x86)\boost\boost_1_42&quot;"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalLibraryDirectories="&quot;$(OGRE_BUILD)\lib\$(ConfigurationName)&quot;;&quot;$(OGRE_SRC)\Dependencies\lib\$(ConfigurationName)&quot;"
+		AdditionalLibraryDirectories="&quot;$(OGRE_HOME)\lib\$(ConfigurationName)&quot;;&quot;$(OGRE_HOME)\Dependencies\lib\$(ConfigurationName)&quot;;&quot;C:\Program Files (x86)\boost\boost_1_42\lib&quot;"
 	/>
 	<Tool
 		Name="VCPostBuildEventTool"
@@ -18,17 +18,11 @@
 		CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(OGRE_BIN)&quot;"
 	/>
 	<UserMacro
-		Name="OGRE_SRC"
-		Value="D:\dev\OgreDev\ogre1.7.RC1"
-		PerformEnvironmentSet="true"
+		Name="OGRE_HOME"
+		Value="D:\dev\Dependencies\win32\ogre1.7.1sdk"
 	/>
 	<UserMacro
-		Name="OGRE_BUILD"
-		Value="D:\dev\OgreDev\ogre1.7.RC1\build"
-		PerformEnvironmentSet="true"
-	/>
-	<UserMacro
 		Name="OGRE_BIN"
-		Value="$(OGRE_BUILD)\bin\$(ConfigurationName)"
+		Value="$(OGRE_HOME)\bin\$(ConfigurationName)"
 	/>
 </VisualStudioPropertySheet>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.