From f34c05943e8174393e6176ff403264ca35e7928a Mon Sep 17 00:00:00 2001
From: psperl <psperl@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Sun, 20 Jul 2008 03:48:06 +0000
Subject: [PATCH] I still sense a disturbance in the code, but we are making
 progress

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1113 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/projectM-engine/Renderer.cpp     | 5 ++++-
 src/projectM-engine/ShaderEngine.cpp | 6 +++++-
 src/projectM-engine/ShaderEngine.hpp | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp
index fc18339fe..83bf6933d 100644
--- a/src/projectM-engine/Renderer.cpp
+++ b/src/projectM-engine/Renderer.cpp
@@ -273,6 +273,7 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp
 	SetupPass1(presetOutputs, *presetInputs);
 
 #ifdef USE_CG
+	shaderEngine.SetupCgQVariables(presetOutputs->warpShader, *presetOutputs);
 	shaderEngine.enableShader(presetOutputs->warpShader, presetOutputs, presetInputs);
 #endif
 
@@ -579,10 +580,12 @@ void Renderer::PerPixelMath(PresetOutputs * presetOutputs, PresetInputs * preset
 
 void Renderer::reset(int w, int h)
 {
-	this->aspect = (float) h / (float) w;
+	aspect = (float) h / (float) w;
 	this -> vw = w;
 	this -> vh = h;
 
+	shaderEngine.setAspect(aspect);
+
 	glShadeModel(GL_SMOOTH);
 
 	glCullFace(GL_BACK);
diff --git a/src/projectM-engine/ShaderEngine.cpp b/src/projectM-engine/ShaderEngine.cpp
index 59ef1851b..12d3a493d 100644
--- a/src/projectM-engine/ShaderEngine.cpp
+++ b/src/projectM-engine/ShaderEngine.cpp
@@ -228,7 +228,7 @@ bool ShaderEngine::LoadCgProgram(Shader &shader)
 		while (found != std::string::npos)
 		{
 			found += 8;
-			size_t end = program.find_first_of(" ;,\n\r)", found);
+			size_t end = program.find_first_of(" ;.,\n\r)", found);
 
 			if (end != std::string::npos)
 			{
@@ -531,6 +531,10 @@ void ShaderEngine::SetupCgQVariables(Shader &shader, const PresetOutputs &q)
 	}
 }
 
+void ShaderEngine::setAspect(float aspect)
+{
+	this->aspect = aspect;
+}
 void ShaderEngine::RenderBlurTextures(const Pipeline *pipeline, const PipelineContext &pipelineContext,
 		const int texsize)
 {
diff --git a/src/projectM-engine/ShaderEngine.hpp b/src/projectM-engine/ShaderEngine.hpp
index 5b09ce1cd..7b98859a0 100644
--- a/src/projectM-engine/ShaderEngine.hpp
+++ b/src/projectM-engine/ShaderEngine.hpp
@@ -104,7 +104,9 @@ public:
 	void enableShader(Shader &shader, const Pipeline *pipeline, const PipelineContext *pipelineContext);
 	void disableShader();
 	void reset();
+	void setAspect(float aspect);
     std::string profileName;
 };
 
 #endif /* SHADERENGINE_HPP_ */
+