1 files changed, 18 insertions, 2 deletions

diff --git a/matchblox/engine/C_MatchBloxEngine.h b/matchblox/engine/C_MatchBloxEngine.h
index 19e0630..9b5bc98 100644
--- a/matchblox/engine/C_MatchBloxEngine.h
+++ b/matchblox/engine/C_MatchBloxEngine.h
@@ -3,7 +3,12 @@
 #define C_MATCHBLOXENGINE_HEADER_FILE

 

 #include "message_queue.h"

+#include "message_input.h"

 #include "typedefs.h"

+#include <list>

+//#include <pair>

+

+using namespace std;

 

 class C_3DObject;

 class C_Block;

@@ -164,6 +169,12 @@ private:
   BoxSize      m_CurrentBox;

   BlockType    m_CurrentBlock;

 

+  //typedef         pair<input_payload_wiimote::dot, input_payload_wiimote::dot> dotpair;

+  //list<dotpair>   m_DotHist;

+  int             m_DotHistSize;

+

+  double        m_dInitialWiimoteDist; //initial distance of wiimote in mm, this distance is

+                                       //mapped to the z=0.0 in world coordinates

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

                             //player

 

@@ -178,8 +189,13 @@ private:
 

   //event/input handlers

   void CursorMove(Vect3D_t &f_NewCursorPos);

-  bool CursorMove_PutBlock(Vect3D_t &f_CursPos, BoundingBox_t &f_CusrBBox);

-  bool CursorMove_GrabBlock(Vect3D_t &f_CursPos, BoundingBox_t &f_CusrBBox);

+  //bool CursorMove_PutBlock(Vect3D_t &f_CursPos, BoundingBox_t &f_CusrBBox);

+  //bool CursorMove_GrabBlock(Vect3D_t &f_CursPos, BoundingBox_t &f_CusrBBox);

+

+  //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);

 

 };