ios stuff

Android_Salmon_Engine.mk

@@ -278,7 +278,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := SalmonEngine
 
 
-LOCAL_CFLAGS := -DTARGET_ANDROID -DTARGET_SALMON -std=gnu++11 --std=c++11
+LOCAL_CFLAGS := -DTARGET_ANDROID -std=gnu++11 --std=c++11
 
 LOCAL_STATIC_LIBRARIES := boost
 LOCAL_STATIC_LIBRARIES += ogg
@@ -318,25 +318,30 @@ LOCAL_SRC_FILES += src/SoundManager/SoundManagerDataTypes.cpp
 LOCAL_SRC_FILES += src/FontManager/FontManager.cpp
 LOCAL_SRC_FILES += src/ScriptManager/ScriptManager.cpp
 LOCAL_SRC_FILES += src/SmartValueManager/SmartValueManager.cpp
-#LOCAL_SRC_FILES += src/GUIManager/GUIManager.cpp
+
-#LOCAL_SRC_FILES += src/GUIManager/ButtonWidget.cpp
+LOCAL_SRC_FILES += src/GUIManager/GUIManager.cpp
+LOCAL_SRC_FILES += src/GUIManager/ButtonWidget.cpp
+LOCAL_SRC_FILES += src/GUIManager/WidgetXmlParsers.cpp
+
+LOCAL_SRC_FILES += src/HalibutAnimation/HalibutAnimation.cpp
 
 LOCAL_SRC_FILES += src/ModelManager/ModelManager.cpp
 LOCAL_SRC_FILES += src/ModelManager/NewModelManager.cpp
 LOCAL_SRC_FILES += src/SimpleLand/SimpleLand.cpp
 LOCAL_SRC_FILES += src/PhysicsManager/PhysicsManager.cpp
 
-
+LOCAL_SRC_FILES += src/Render/RenderInterface.cpp
 LOCAL_SRC_FILES += src/Render/RenderMisc.cpp
 LOCAL_SRC_FILES += src/Render/RenderParams.cpp
-LOCAL_SRC_FILES += src/Render/SalmonRender/BackgroundCubemap.cpp
 
-LOCAL_SRC_FILES += src/Animation/SalmonAnimation.cpp
+LOCAL_SRC_FILES += src/Render/SalmonRender/BackgroundCubemap.cpp
-LOCAL_SRC_FILES += src/Render/RenderInterface.cpp
-LOCAL_SRC_FILES += src/ApplicationInterface.cpp
 LOCAL_SRC_FILES += src/Render/SalmonRender/SalmonRenderInterface.cpp
 LOCAL_SRC_FILES += src/Render/SalmonRender/SalmonRenderGLES20.cpp
 LOCAL_SRC_FILES += src/Render/SalmonRender/SalmonRenderAndroid.cpp
+LOCAL_SRC_FILES += src/Render/SalmonRender/Cameras.cpp
+
+LOCAL_SRC_FILES += src/Animation/SalmonAnimation.cpp
+LOCAL_SRC_FILES += src/ApplicationInterface.cpp
 LOCAL_SRC_FILES += src/SalmonEngineAndroid.cpp
 LOCAL_SRC_FILES += src/SalmonEngineInterface.cpp
 LOCAL_LDLIBS    := -lGLESv2

include/SalmonEngineAndroid.h

@@ -31,33 +31,16 @@ public:
 	virtual void InnerDeinit() = 0;
 	//To do on deinit
 
-	virtual void OuterDraw();
-
 	virtual void InnerDraw() = 0;
 	//What to draw
 
-	virtual void OuterUpdate(cardinal timer);
-
 	virtual void InnerUpdate(cardinal timer) = 0;
 	//To do on update
 	
-	virtual void UpdateQuick() { };
-	//To process input - this method is called more frequently than Update()  
-
-	virtual void OnMouseMove(TMouseState& mouseState) { }
-	//To do on mouse move (with or without pressed buttons)
-
-	virtual void OnMouseDown(TMouseState& mouseState) { }
-	//To do on mouse up (with or without pressed buttons)
-
-	virtual void OnMouseUp(TMouseState& mouseState) { }
-	//To do on mouse down (with or without pressed buttons)
-	//Be careful - even when user "upped" button, in mouseState this button appears as pressed
-
-	virtual void OnMouseWheel(short int delta) { }
-	//To do on mouse wheel move
 };
 
 } //namespace SE
 
+#include "include/GUIManager/WidgetTemplatesImpl.h"
+
 #endif

src/SalmonEngineAndroid.cpp

@@ -19,9 +19,10 @@ void TApplication::OuterInit(int screenWidth, int screenHeight, float matrixWidt
 
 	ResourceManager->ScriptManager.BindBasicFunctions();
 
+	Renderer->InitOpenGL(screenWidth, screenHeight, matrixWidth, matrixHeight);
+	
 	InnerInit();
 	
-	Renderer->InitOpenGL(screenWidth, screenHeight, matrixWidth, matrixHeight);
 	CheckGlError();
 }
 
@@ -67,16 +68,4 @@ void TApplication::OuterDeinit()
 	
 }
 
-
-void TApplication::OuterDraw()
-{
-	InnerDraw();
-}
-
-void TApplication::OuterUpdate(cardinal timer)
-{
-	InnerUpdate(timer);
-}
-
-
 } //namespace SE