First blood

Templates/SalmonUniversalTemplate/jni/Android.mk

@@ -0,0 +1,77 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+LPATH := $(call my-dir)
+
+ENGINE_PATH = $(SalmonEnginePathCygwin)
+
+BOOST_PATH = $(LibsPathCygwin)/boost_1_47_0
+
+OGG_PATH = $(LibsPathCygwin)/libogg-1.3.0
+
+VORBIS_PATH = $(LibsPathCygwin)/libvorbis-1.3.2
+
+SQUIRREL_PATH = $(LibsPathCygwin)/sqplus
+
+LIBPNG_PATH = $(LibsPathCygwin)/libpng_1.4.1_android
+
+ZIP_PATH = $(LibsPathCygwin)/julienr-libzip-android/jni
+
+#====== ENGINE AND LIBS =====================
+
+include $(ENGINE_PATH)/Android_Salmon_Engine.mk
+
+#================= THE GAME =======================
+
+
+LOCAL_PATH:= $(LPATH)
+
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS := -DTARGET_ANDROID -DNOSOUND -DTARGET_SALMON -std=gnu++11 --std=c++11
+LOCAL_STATIC_LIBRARIES := boost
+LOCAL_STATIC_LIBRARIES += squirrel
+LOCAL_STATIC_LIBRARIES += png_lib
+LOCAL_STATIC_LIBRARIES += zip
+LOCAL_SHARED_LIBRARIES := SalmonEngine
+LOCAL_SHARED_LIBRARIES += gnustl_shared
+LOCAL_C_INCLUDES := $(ENGINE_PATH)
+LOCAL_C_INCLUDES += $(BOOST_PATH)
+LOCAL_C_INCLUDES += $(VORBIS_PATH)/include
+LOCAL_C_INCLUDES += $(VORBIS_PATH)/include/vorbis
+LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib
+LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/books
+LOCAL_C_INCLUDES += $(VORBIS_PATH)/lib/modes
+LOCAL_C_INCLUDES += $(OGG_PATH)/include
+LOCAL_C_INCLUDES += $(OGG_PATH)/include/ogg
+LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/include
+LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqplus
+LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/squirrel
+LOCAL_C_INCLUDES += $(SQUIRREL_PATH)/sqstdlib
+LOCAL_C_INCLUDES += $(LIBPNG_PATH)
+LOCAL_C_INCLUDES += $(ZIP_PATH)
+LOCAL_MODULE    := SalmonJniTemplate
+LOCAL_SRC_FILES := main_code.cpp
+LOCAL_SRC_FILES += android_api.cpp
+
+LOCAL_LDLIBS    := -lGLESv2
+LOCAL_LDLIBS    += -llog -Wl
+
+#debug
+#LOCAL_CFLAGS += -g -ggdb -O0
+#LOCAL_LDLIBS    += -g -ggdb
+
+include $(BUILD_SHARED_LIBRARY)

Templates/SalmonUniversalTemplate/jni/Application.mk

@@ -0,0 +1,3 @@
+APP_STL  := gnustl_shared
+APP_CPPFLAGS += -fexceptions
+APP_CPPFLAGS += -frtti

Templates/SalmonUniversalTemplate/jni/android_api.cpp

@@ -0,0 +1,128 @@
+#include "android_api.h"
+
+#include "main_code.h"
+#include "boost\thread.hpp"
+
+boost::shared_ptr<TMyApplication> App(new TMyApplication);
+
+boost::mutex m;
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Init(JNIEnv * env, jobject obj,  jint width, jint height)
+{
+
+	m.lock();
+	try
+	{
+	if (App->IsInited())
+	{
+		App->OuterDeinit(); //Clean up what is left at previous launch (if applicable)
+	}
+	
+	App->OuterInit(width, height, 480.f, 320.f);
+	
+	App->Inited = true;
+	}
+	catch (...)
+	{
+		throw;
+	}
+	m.unlock();
+}	
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_StopSounds(JNIEnv * env, jobject obj)
+{
+
+}
+
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Update(JNIEnv * env, jobject obj, long dt)
+{
+m.lock();
+	try
+	{
+	if (App->IsInited())
+	{
+		App->OuterDraw();
+		App->OuterUpdate(dt);
+	}
+	
+	}
+	catch (...)
+	{
+		throw;
+	}
+	m.unlock();
+
+}
+
+JNIEXPORT int JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_IsInited(JNIEnv * env, jobject obj)
+{   
+
+    if (App->IsInited())
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+
+}
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Destroy(JNIEnv * env, jobject obj)
+{
+m.lock();
+	try
+	{
+	if (App->IsInited())
+	{
+		App->OuterDeinit();
+		App->Inited = false;
+	}
+	
+	}
+	catch (...)
+	{
+		throw;
+	}
+	m.unlock();
+}
+
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapDown(JNIEnv * env, jobject obj, float x, float y, long time)
+{
+m.lock();
+	try
+	{
+		Renderer->MoveDist(1.0f);
+	}
+	catch (...)
+	{
+		throw;
+	}
+	m.unlock();
+}
+
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapUp(JNIEnv * env, jobject obj, float x, float y, long time)
+{
+}
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapMove(JNIEnv * env, jobject obj, float x, float y, long time)
+{
+}
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnFling(JNIEnv * env, jobject obj, jfloat velocityX, jfloat velocityY, long time)
+{
+    
+}
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnScroll(JNIEnv * env, jobject obj, jfloat distanceX, jfloat distanceY, long time)
+{
+    
+}
+
+JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnKeyPress(JNIEnv * env, jobject obj, jint keyCode)
+{
+	//App->OnKeyPress(keyCode);
+}

Templates/SalmonUniversalTemplate/jni/android_api.h

@@ -0,0 +1,33 @@
+#ifndef ANDROID_API_H_INCLUDED
+#define ANDROID_API_H_INCLUDED
+
+#include <jni.h>
+#include <android/log.h>
+
+#include <GLES/gl.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+#include "boost/shared_ptr.hpp"
+
+#include "main_code.h"
+
+using namespace SE;
+
+
+extern "C" {
+    JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Init(JNIEnv * env, jobject obj,  jint width, jint height);
+    JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_StopSounds(JNIEnv * env, jobject obj);
+    JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Update(JNIEnv * env, jobject obj, long dt);
+	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_Destroy(JNIEnv * env, jobject obj);
+	JNIEXPORT int JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_IsInited(JNIEnv * env, jobject obj);
+	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapDown(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
+	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapUp(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
+	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnTapMove(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
+	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnFling(JNIEnv * env, jobject obj, jfloat velocityX, jfloat velocityY, long time);
+	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnScroll(JNIEnv * env, jobject obj, jfloat distanceX, jfloat distanceY, long time);
+	JNIEXPORT void JNICALL Java_fishrungames_salmonjnitemplate_JniWrapper_OnKeyPress(JNIEnv * env, jobject obj, jint keyCode);
+};
+
+
+#endif

Templates/SalmonUniversalTemplate/jni/main_code.cpp

@@ -0,0 +1,91 @@
+#include "main_code.h"
+
+#ifdef TARGET_ANDROID
+#include "android_api.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <time.h>
+
+#include "include/Engine.h"
+
+#include "main_code.h"
+
+
+void TMyApplication::InnerInit()
+{
+	
+	*Console<<"Inner init go!\n";
+
+#ifdef TARGET_ANDROID
+	ResourceManager->PathToResources = "";
+#endif
+#ifdef TARGET_WIN32
+#ifdef NDEBUG
+	ResourceManager->PathToResources = "resources/";
+#else
+	ResourceManager->PathToResources = "../../../assets/";
+#endif
+#endif
+#ifdef TARGET_IOS
+	ResourceManager->PathToResources = "assets/";
+#endif
+
+	ResourceManager->TexList.AddTexture(CONST_CONSOLE_TEX_NAME);
+
+	ResourceManager->ShaderManager.AddShader("DefaultShader", "gui_transparent.vertex", "gui_transparent.fragment");
+    
+    Renderer->PushShader("DefaultShader");
+
+	ResourceManager->FontManager.AddFont("droid_sans14", "droid_sans14_font_bitmap.bmp32", "droid_sans14_font_charmap.txt");
+	ResourceManager->FontManager.PushFont("droid_sans14");
+
+	ResourceManager->SoundManager.LoadMusic("level1ogg.ogg");
+	
+    ResourceManager->SoundManager.LoadSound("shot.wav");
+	
+	Renderer->MovePhi(pi/6);
+	Renderer->MoveDist(6.f);
+	
+	ResourceManager->LightManager.SetLightDirection(vec3(-1,0,-1));
+	ResourceManager->LightManager.SetLightColor(vec4(1,0,0,1));
+
+	ResourceManager->TexList.AddTexture("bt_box_yellow.bmp");
+	ResourceManager->FlexModelManager.LoadModelFromXml("model.xml");
+
+	FlexModel = ResourceManager->FlexModelManager.InstanciateModel("model.xml");
+
+	FlexModel.MoveModel(vec3(1, -4, -4));
+	FlexModel.ScaleModel(0.4f);
+	FlexModel.RefreshBuffer();
+
+	//Uncomment to start music playing
+	//ResourceManager->SoundManager.PlayMusic("level1ogg.ogg");
+	
+	*Console<<"Inner init end!\n";
+}
+
+void TMyApplication::InnerDeinit()
+{
+}
+
+
+void TMyApplication::InnerDraw()
+{
+    
+	glClearColor(0,0,0,1);
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    Renderer->SetGLCamView();
+	FlexModel.Draw();
+	
+}
+
+
+void TMyApplication::InnerUpdate(cardinal dt)
+{
+
+}
+

Templates/SalmonUniversalTemplate/jni/main_code.h

@@ -0,0 +1,54 @@
+#ifndef MAIN_CODE_H_INCLUDED
+#define MAIN_CODE_H_INCLUDED
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+
+#ifdef TARGET_ANDROID
+
+#include <GLES/gl.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#endif
+
+#include "boost/shared_ptr.hpp"
+#include "boost/thread/thread.hpp"
+#include "boost/assign.hpp"
+#include "boost/bind.hpp"
+#include "boost/asio.hpp"
+#include "boost/signal.hpp"
+
+#include "include/Engine.h"
+
+using namespace SE;
+
+
+class TMyApplication : public TApplication
+{
+protected:
+	
+public:
+	bool Inited;
+
+	TFlexModel FlexModel;
+
+	TMyApplication() : TApplication(), Inited(false) { }
+
+	
+     virtual void InnerInit();
+    
+     virtual void InnerDeinit();
+	
+	 virtual void InnerDraw();
+	
+	 virtual void InnerUpdate(cardinal dt);
+	 
+	bool IsInited() { return Inited; }
+	
+
+};
+
+
+#endif