1 files changed, 15 insertions, 6 deletions

diff --git a/matchblox/engine/C_MatchBloxEngine.h b/matchblox/engine/C_MatchBloxEngine.h
index 4e5fcf3..5d90291 100644
--- a/matchblox/engine/C_MatchBloxEngine.h
+++ b/matchblox/engine/C_MatchBloxEngine.h
@@ -6,7 +6,7 @@
 #include "message_input.h"

 #include "typedefs.h"

 #include <list>

-#include "C_Smoother.h"

+#include "C_Smoother.h" 

 //#include <pair>

 

 using namespace std;

@@ -157,9 +157,9 @@ public:
   ~C_MatchBloxEngine();

 

   GameResult ProcessMsgs(void);

-  void Render(unsigned int f_uiElapsedTime);

-

-  bool NewGame(int f_iUserID, int f_iGameId, BoxSize f_BS);

+  void Render(unsigned int f_uiElapsedTime, input_payload_wiimote &f_HTWiimote, FrustumParms_t &f_FrustParms);

+  

+  bool NewGame(int f_iGameMode);

   bool StartGame();

   bool Pause();

   bool Resume();

@@ -189,14 +189,25 @@ private:
                                        //mapped to the z=0.0 in world coordinates

   BoundingBox_t m_WorldBox; //an invisible box that limits the movement of the 

                             //player

+  bool m_bHeadTrackingEnabled,

+       m_bStereoEnabled;

+  GLuint          m_GrayScaleShaderProgram;   //handle to the grayscale shader program

+  GLint           m_GSConvScaleLocation,      //handle to the g_ConversionScale variable in the shader

+                  m_GSTextureLocation;        //

+  GLfloat         m_GSConvScale[3];           //grayscale conversion scale (default 0.299, 0.587, 0.114)

 

 

   //init routines

   bool LoadModels(const char* f_strModelDir);

   void DeleteModels();

   void LoadTexture(const char* f_BmpName, GLuint &f_uiTexHandle);

+  bool LoadGrayScaleShader();

 

   //render routines

+  void RenderEnv(unsigned int f_uiElapsedTime);

+  void RenderMain(unsigned int f_uiElapsedTime);

+  void RenderOverlay(unsigned int f_uiElapsedTime);

+

   void RenderGetReady();

   void RenderHUD(unsigned int f_uiElapsedTime);

   void RenderResults();

@@ -213,8 +224,6 @@ private:
   void GameFinished();

 

   //wiimote functions

-  //bool FindIRDots(input_payload_wiimote *f_pWiimote, ir_dot_t f_Dot[2]);

-  //bool CalcWiimoteRelativeCursorPos(input_payload_wiimote *f_pWiimote, Vect3D_t *f_pRelPos);

   bool ConvertWiimoteToWorld(input_payload_wiimote *f_pWiimote, Vect3D_t *f_WorldPos);

 

 };