[Csp-commits] svn:csp r2236 - trunk/csp/tools/cloud_prototype

[<sv...@ww...>]

Author: nsmoooose
Date: 2008-04-18 11:00:14 -0700 (Fri, 18 Apr 2008)
New Revision: 2236

Added:
   trunk/csp/tools/cloud_prototype/build.sh
Modified:
   trunk/csp/tools/cloud_prototype/CloudBox.cpp
   trunk/csp/tools/cloud_prototype/CloudMath.h
   trunk/csp/tools/cloud_prototype/CloudRegistry.h
Log:
Fixed issues with cloud prototype on linux. Added build script (build.sh) that will generate a prototype executable.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2236

Modified: trunk/csp/tools/cloud_prototype/CloudBox.cpp
===================================================================
--- trunk/csp/tools/cloud_prototype/CloudBox.cpp	2008-04-18 11:42:45 UTC (rev 2235)
+++ trunk/csp/tools/cloud_prototype/CloudBox.cpp	2008-04-18 18:00:14 UTC (rev 2236)
@@ -9,7 +9,7 @@
 T FindCorrectLevel(std::vector<std::pair<float, T> >& v, float value) {
 	T default_value;
 
-	for(std::vector<std::pair<float, T> >::size_type index = 0;index < v.size();++index) {
+	for(typename std::vector<std::pair<float, T> >::size_type index = 0;index < v.size();++index) {
 		if(value >= v.at(index).first) {
 			default_value = v.at(index).second;
 		}

Modified: trunk/csp/tools/cloud_prototype/CloudMath.h
===================================================================
--- trunk/csp/tools/cloud_prototype/CloudMath.h	2008-04-18 11:42:45 UTC (rev 2235)
+++ trunk/csp/tools/cloud_prototype/CloudMath.h	2008-04-18 18:00:14 UTC (rev 2236)
@@ -1,7 +1,7 @@
 #ifndef __CSPSIM_CLOUDS_CLOUDMATH_H__
 #define __CSPSIM_CLOUDS_CLOUDMATH_H__
 
-#include <osg/vec3>
+#include <osg/Vec3>
 
 namespace csp {
 namespace clouds {

Modified: trunk/csp/tools/cloud_prototype/CloudRegistry.h
===================================================================
--- trunk/csp/tools/cloud_prototype/CloudRegistry.h	2008-04-18 11:42:45 UTC (rev 2235)
+++ trunk/csp/tools/cloud_prototype/CloudRegistry.h	2008-04-18 18:00:14 UTC (rev 2236)
@@ -20,8 +20,8 @@
 
 	static CloudVector CreateDefaultClouds();
 
-	static CloudBox::ColorLevelVector CloudRegistry::CreateDefaultColorLevels();
-	static CloudBox::OpacityLevelVector CloudRegistry::CreateDefaultOpacityLevels();
+	static CloudBox::ColorLevelVector CreateDefaultColorLevels();
+	static CloudBox::OpacityLevelVector CreateDefaultOpacityLevels();
 };
 
 }	// end namespace clouds

Added: trunk/csp/tools/cloud_prototype/build.sh
===================================================================
--- trunk/csp/tools/cloud_prototype/build.sh	                        (rev 0)
+++ trunk/csp/tools/cloud_prototype/build.sh	2008-04-18 18:00:14 UTC (rev 2236)
@@ -0,0 +1,2 @@
+gcc Cloud.cpp CloudBox.cpp CloudMath.cpp CloudRegistry.cpp CloudTextureFactory.cpp visitors/RemoveRedundantCloudSpritesVisitor.cpp visitors/UpdateCloudModelVisitor.cpp Program.cpp \
+-o prototype -Xlinker -losg -losgViewer


Property changes on: trunk/csp/tools/cloud_prototype/build.sh
___________________________________________________________________
Name: svn:executable
   + *