MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge diff branch

Browse Source
This commit is contained in:
Maksim Gamarnik 2019-04-01 21:33:19 +02:00 committed by MoNTE48
parent 06b1df684f
commit cc3045473e
7 changed files with 127 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/android/Makefile
View File

@ -77,14 +77,14 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)/timestamp
IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp
IRRLICHT_URL_HTTP = https://github.com/zaki/irrlicht/archive/$(IRRLICHT_COMMIT).zip
CURL_VERSION = 7.62.0
CURL_VERSION = 7.64.0
CURL_DIR = $(ANDR_ROOT)/deps/curl
CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
CURL_TIMESTAMP = $(CURL_DIR)/timestamp
CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp
CURL_URL_HTTP = http://dl.uxnr.de/mirror/curl/curl-${CURL_VERSION}.tar.bz2
FREETYPE_VERSION = 2.9.1
FREETYPE_VERSION = 2.10.0
FREETYPE_DIR = $(ANDR_ROOT)/deps/freetype
FREETYPE_LIB = $(FREETYPE_DIR)/objs/.libs/libfreetype.a
FREETYPE_TIMESTAMP = $(FREETYPE_DIR)/timestamp

8
src/porting_android.cpp
View File

@ -68,10 +68,10 @@ void android_main(android_app *app)
/* TODO this doesn't work as expected, no idea why but there's a workaround */
/* for it right now */
extern "C" {
JNIEXPORT void JNICALL Java_mobi_MultiCraft_GameActivity_putMessageBoxResult(
JNIEXPORT void JNICALL Java_com_multicraft_game_GameActivity_putMessageBoxResult(
JNIEnv *env, jclass j_this, jstring text)
{
errorstream << "Java_mobi_MultiCraft_GameActivity_putMessageBoxResult got: "
errorstream << "Java_com_multicraft_game_GameActivity_putMessageBoxResult got: "
<< std::string((const char*)env->GetStringChars(text,0))
<< std::endl;
}
@ -125,7 +125,7 @@ void initAndroid()
exit(-1);
}
nativeActivity = findClass("mobi/MultiCraft/GameActivity");
nativeActivity = findClass("com/multicraft/game/GameActivity");
if (nativeActivity == 0) {
errorstream <<
"porting::initAndroid unable to find java native activity class" <<
@ -206,7 +206,7 @@ void initializePathsAndroid()
cls_File, mt_getAbsPath, "getCacheDir");
path_storage = getAndroidPath(cls_Env, NULL, cls_File, mt_getAbsPath,
"getExternalStorageDirectory");
path_user = path_storage + DIR_DELIM + "Android/data/mobi.MultiCraft/files";
path_user = path_storage + DIR_DELIM + "Android/data/com.multicraft.game/files";
path_share = path_user;
path_locale = path_user + DIR_DELIM + "locale";
}

21
src/porting_ios.cpp
View File

@ -1,3 +1,24 @@
/*
MultiCraft
Copyright (C) 2014-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua
Copyright (C) 2016-2019 sfan5
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 3.0 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <string>
#include "porting.h"

21
src/porting_ios.h
View File

@ -1,3 +1,24 @@
/*
MultiCraft
Copyright (C) 2014-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua
Copyright (C) 2016-2019 sfan5
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 3.0 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __PORTING__IOS_H__
#define __PORTING__IOS_H__

12
src/touchscreengui.cpp
View File

@ -1,5 +1,6 @@
/*
Copyright (C) 2014 sapier
Copyright (C) 2014-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@ -57,9 +58,9 @@ const char* touchgui_button_imagenames[] = {
"noclip_btn.png",
#endif*/
"minimap_btn.png",
// "debug_btn.png",
//"debug_btn.png",
"chat.png",
// "camera.png",
//"camera.png",
"rangeview.png",
"rangeview_ios.png",
"empty.png",
@ -150,7 +151,7 @@ TouchScreenGUI *g_touchscreengui;
TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, IEventReceiver* receiver):
m_device(device),
m_guienv(device->getGUIEnvironment()),
// m_camera_yaw(0.0),
//m_camera_yaw(0.0),
m_camera_pitch(0.0),
m_visible(false),
m_move_id(-1),
@ -347,15 +348,12 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc)
#endif*/
#ifdef __IOS__
// iOS bar
/* init pause button */
initButton(escape_id,
rect<s32>(m_screensize.X / 2 - (button_size * 0.75), 0,
m_screensize.X / 2,
(button_size * 0.75)),
m_screensize.X / 2, (button_size * 0.75)),
L"Exit", false, SLOW_BUTTON_REPEAT);
/* init rangeselect button */

5
src/touchscreengui.h
View File

@ -1,5 +1,6 @@
/*
Copyright (C) 2014 sapier
Copyright (C) 2014-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@ -54,9 +55,9 @@ typedef enum {
fast_id,
#endif
minimap_id,
// debug_id,
//debug_id,
chat_id,
// camera_id,
//camera_id,
range_id,
range_ios_id,
empty_id,