minor fixing

include/Engine.h

@@ -1,30 +1,15 @@
 #ifndef ENGINE_H_INCLUDED
 #define ENGINE_H_INCLUDED
 
-
-#ifdef TARGET_SALMON
-	#ifdef TARGET_WIN32
-		#define SALMON_WIN32
-	#endif
-
-	#ifdef TARGET_ANDROID
-		#define SALMON_ANDROID
-	#endif
-    #ifdef TARGET_IOS
-        #define SALMON_IOS
-    #endif
-#endif
-
-
-#ifdef SALMON_WIN32
+#ifdef TARGET_WIN32
 #include "SalmonEngineWindows.h"
 #endif
 
-#ifdef SALMON_ANDROID
+#ifdef TARGET_ANDROID
 #include "SalmonEngineAndroid.h"
 #endif
 
-#ifdef SALMON_IOS
+#ifdef TARGET_IOS
 #include "include/SalmonEngineIos.h"
 #endif
 

include/Render/SalmonRender/SalmonRenderInterface.h

@@ -27,30 +27,24 @@ protected:
 
 	float GlobalShadowAreaHalfSize;
 
+	vec3 CamPos;  //Do not change - call CalcCamPos instead
+
 	virtual void DrawQuad(const T2DQuad& quad) = 0;
 public:
 
-	TCamera CameraMover;
-
-	//vec3 CamShift;
-	vec3 CamPos;  //Do not change - call CalcCamPosVec instead
-	//vec3 CamVec;  //Do not change - call CalcCamPosVec instead
-
-	vec3 GetCamShift()
-	{
-		return boost::apply_visitor(TGetCamShiftVisitor(), CameraMover);
-	}
-
-	vec3 GetCamVec()
-	{
-		return boost::apply_visitor(TGetCamVecVisitor(), CameraMover);
-	}
+	TCamera Camera;
 
 	TSalmonRendererInterface();
 	
 	virtual void InitOpenGL(int screenWidth, int screenHeight, float matrixWidth, float matrixHeight);
 
-	void CalcCamPosVec();
+	vec3 GetCamShift();
+
+	vec3 GetCamVec();
+
+	vec3 GetCamPos();
+
+	void CalcCamPos();
 
 	virtual void SetUniforms();
 
@@ -75,8 +69,6 @@ public:
 	void SetGlNegZView();
 
 
-	vec3 GetCamPos();
-
 	virtual void SwitchToScreen();
 	virtual void SwitchToFrameBuffer(const std::string& frameName);
 	void SwitchToCubemapBuffer(const std::string& frameName,cardinal cubeSide);