fixing unitialized vars for lars

CLOUDS-Interactive-Documentary · Jun 27, 2014 · 10335e6 · 10335e6
1 parent e942217
commit 10335e6
Show file tree

Hide file tree

Showing 12 changed files with 796 additions and 15 deletions.
diff --git a/CloudsData/visualsystems/Histogram/Presets/DataHistogram3/Timeline/cameraTrack.xml b/CloudsData/visualsystems/Histogram/Presets/DataHistogram3/Timeline/cameraTrack.xml
@@ -2,7 +2,7 @@
     <key>
         <px>20.572837830</px>
         <py>310.451416016</py>
-        <pz>-4703.278320312</pz>
+        <pz>-4703.278320313</pz>
         <ox>0.016139915</ox>
         <oy>0.996168375</oy>
         <oz>0.082449183</oz>

diff --git a/CloudsLibrary/src/VisualSystems/Mandala/vs_src/CloudsVisualSystemMandala.cpp b/CloudsLibrary/src/VisualSystems/Mandala/vs_src/CloudsVisualSystemMandala.cpp
@@ -5,9 +5,33 @@
 #include "CloudsVisualSystemMandala.h"
 #include "CloudsRGBDVideoPlayer.h"
 #include <stdlib.h>     /* atoi */
+template<typename T>
+inline bool isinf(T value)
+{
+	return value == std::numeric_limits<T>::infinity() ||
+			value == -std::numeric_limits<T>::infinity() ;
+}
 
 int MandalaComponent::componentCount = 1;
 
+CloudsVisualSystemMandala::CloudsVisualSystemMandala()
+{
+	polarAlphaExpo, polarAlphaExpoScale = 0;	
+	surfaceNoiseTime = 0;
+
+	noiseTime = noiseTimeScale = noiseScale = noiseOffset = 0;
+	numU = numV = 0;
+	radius = 0;
+	bDrawClock = false;
+	clockNumCogs, clockScale, clockOctaves, cloackOctaveScale, clockMaxSpeed, clockTime, clockSpread, clockV = 0;	
+	bDrawBoxClock = false;
+	hexMeshVertexCount = 0;
+	bDrawOffsetMesh = false;
+	time = faceScale = faceOffset = noiseOctaveScale = noiseExpo = noiseExpoScale = meshNoiseScale = colorMixScale = 0;
+	bDrawSurface = bSmoothSurface = bDrawTails = bDrawSpokes = false;
+	lastTime = currentTime = 0;	
+}
+
 void CloudsVisualSystemMandala::selfSetupGui()
 {
 	vector<string> blendTypes;

diff --git a/CloudsLibrary/src/VisualSystems/Mandala/vs_src/CloudsVisualSystemMandala.h b/CloudsLibrary/src/VisualSystems/Mandala/vs_src/CloudsVisualSystemMandala.h
@@ -26,6 +26,7 @@ class SPMesh :  public ofNode{
 	SPMesh(){
 		sp = NULL;
 		bDraw = true;
+		m = NULL;
 	};
 	~SPMesh(){};
 
@@ -316,10 +317,9 @@ class TailLoft{
 };
 class CloudsVisualSystemMandala : public CloudsVisualSystem {
 public:
-
-	//TODO: Change this to the name of your visual system
-	//This determines your data path so name it at first!
-	//ie getVisualSystemDataPath() uses this
+
+	CloudsVisualSystemMandala();
+
     string getSystemName(){
 		return "Mandala";
 	}

diff --git a/CloudsLibrary/src/VisualSystems/Mandala/vs_src/MandalaComponent.cpp b/CloudsLibrary/src/VisualSystems/Mandala/vs_src/MandalaComponent.cpp
@@ -45,7 +45,7 @@ void MandalaComponent::setMesh( ofVboMesh* _m )
 
 void MandalaComponent::setUV( float u, float v)
 {
-	pOnS.uv.set( u,v );
+	pOnS.uv.set(u,v);
 }
 
 void MandalaComponent::setUV( ofVec2f uv)

diff --git a/CloudsLibrary/src/VisualSystems/Mandala/vs_src/MandalaTicker.h b/CloudsLibrary/src/VisualSystems/Mandala/vs_src/MandalaTicker.h
@@ -14,17 +14,23 @@ template <class T> class MandalaTicker
 public:
 	MandalaTicker( int easeType = OFX_TWEEN_QUINT)
 	{
-		bLoop = false;
-		bContinue = false;
+
 		endTrigger = false;
-		bReverse = false;
-
+		bLoop = bContinue = bReverse = bPaused = bStarted = bEnded = false;
+		startTime = endTime = span = delay = blend = 0;
+		startVal = targetVal = localVal = delta = 0;
+		value = NULL;
+		ease = 0;
+
+		replayCount = 0;
+
 		easeType = ofxTween::easeInOut;
 		ease = OFX_TWEEN_QUINT;
 
 		note = "_";
 		miscVal = 1;
 	};
+
 	~MandalaTicker()
 	{
 	};

diff --git a/CloudsLibrary/src/VisualSystems/Mandala/vs_src/SurfacePoint.h b/CloudsLibrary/src/VisualSystems/Mandala/vs_src/SurfacePoint.h
@@ -27,11 +27,18 @@ class SurfacePoint{
 
 	void operator = (SurfacePoint sp);
 
-	//private:
 	ofVec3f position, normal;
-	ofVec2f uv;
 
 	ofVec3f* outpos;
 	ofVec3f* outnorm;
 	ofxSimpleSurface* surface;
+	//ofVec2f& getUV(){
+	//	return uv;
+	//}
+	//void setUV(const ofVec2f& uv){
+	//	this->uv.set(uv);
+	//}
+//private:
+	ofVec2f uv;
+
 };
diff --git a/VSMandala/VSMandala.sln b/VSMandala/VSMandala.sln
@@ -0,0 +1,55 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxUILib", "..\..\..\addons\ofxUI\ofxUILib\ofxUILib.vcxproj", "{641DB976-E775-4D72-86EB-897E2C4A0EEE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxTimelineLib", "..\..\..\addons\ofxTimeline\ofxTimelineLib\ofxTimelineLib.vcxproj", "{A72C4F16-CB16-4143-BA5C-5E4FA802D636}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSMandala", "VSMandala.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|Win32.Build.0 = Debug|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|x64.ActiveCfg = Debug|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|x64.Build.0 = Debug|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|Win32.ActiveCfg = Release|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|Win32.Build.0 = Release|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|x64.ActiveCfg = Release|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|x64.Build.0 = Release|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|Win32.Build.0 = Debug|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|x64.ActiveCfg = Debug|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|x64.Build.0 = Debug|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|Win32.ActiveCfg = Release|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|Win32.Build.0 = Release|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|x64.ActiveCfg = Release|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|x64.Build.0 = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal