From acdff416f0a52760fc2104417edd7b6af92a3d5e Mon Sep 17 00:00:00 2001
From: w1z7ard <w1z7ard@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Fri, 22 Jun 2007 06:45:59 +0000
Subject: [PATCH] - started first guess at Preset::evaluateFrame(), the all in
 one preset eval function - remove dead looking code in custom shape header -
 god knows what else

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@209 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/projectM-engine/CustomShape.h |  2 --
 src/projectM-engine/Preset.cpp    | 14 ++++++++++++++
 src/projectM-engine/Preset.hpp    |  3 +--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/projectM-engine/CustomShape.h b/src/projectM-engine/CustomShape.h
index d7c4a0555..c507ea71d 100755
--- a/src/projectM-engine/CustomShape.h
+++ b/src/projectM-engine/CustomShape.h
@@ -102,8 +102,6 @@ public:
 
     int checkTrees();       /** Checks all internal trees are built correctly */
 
-    
-    void evalCustomShapeInitConditions( Preset *preset );
     void load_custom_shape_init();
     void load_unspecified_init_conds_shape();
     void eval_custom_shape_init_conds();
diff --git a/src/projectM-engine/Preset.cpp b/src/projectM-engine/Preset.cpp
index 1cd745f4f..0ec0fa2cc 100755
--- a/src/projectM-engine/Preset.cpp
+++ b/src/projectM-engine/Preset.cpp
@@ -432,6 +432,20 @@ void Preset::load_custom_shape_init_conditions() {
 
 
 
+void Preset::evaluateFrame() {
+
+	/* Evaluate all equation objects in same order as the renderer */
+
+	evalInitConditions();
+	evalPerFrameEquations();
+	evalPerPixelEqns();
+        evalCustomWaveInitConditions();
+        evalCustomShapeInitConditions();
+	evalCustomWavePerFrameEquations();
+	evalCustomShapePerFrameEquations();
+
+}
+
 /** Evaluates all per-pixel equations */
 void Preset::evalPerPixelEqns() {
 
diff --git a/src/projectM-engine/Preset.hpp b/src/projectM-engine/Preset.hpp
index 576668055..4ed9de57d 100644
--- a/src/projectM-engine/Preset.hpp
+++ b/src/projectM-engine/Preset.hpp
@@ -136,7 +136,7 @@ public:
     ((CustomShape *)custom_shape)->load_custom_shape_init();
     
   }
-
+    
   private:
 	static const std::size_t ARRAY_MAX_SIZE;
 
@@ -146,7 +146,6 @@ public:
 
 	typedef  std::vector<CustomShape*>  cshape_container;
 
-    void evalPerPointEqns();
     void evalCustomWavePerFrameEquations();
     void evalCustomShapePerFrameEquations();	
     void evalInitConditions();