Skip to content

Commit

Permalink
Merge pull request #174 from lilligreen/android
Browse files Browse the repository at this point in the history 
Android platform updates
  • Loading branch information
@lilligreen
lilligreen committed Apr 24, 2014
2 parents 06a7843 + 205f542 commit 38ea160
Show file tree
Hide file tree
Showing 6 changed files with 124 additions and 101 deletions.
28 changes: 25 additions & 3 deletions engine/compilers/android/jni/Android.mk
View file
Expand Up @@ -83,7 +83,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../../../source/gui/editor \
$(LOCAL_PATH)/../../../source/gui/language \
$(LOCAL_PATH)/../../../source/input \
$(LOCAL_PATH)/../../../source/input/leapMotion \
$(LOCAL_PATH)/../../../source/io \
$(LOCAL_PATH)/../../../source/io/resource \
$(LOCAL_PATH)/../../../source/io/zip \
Expand All @@ -102,6 +101,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/../../../source/platform/nativeDialogs \
$(LOCAL_PATH)/../../../source/platformAndroid \
$(LOCAL_PATH)/../../../source/sim \
$(LOCAL_PATH)/../../../source/spine \
$(LOCAL_PATH)/../../../source/string
# $(LOCAL_PATH)/../../../source/testing \
# $(LOCAL_PATH)/../../../source/testing/tests \
Expand Down Expand Up @@ -174,6 +174,7 @@ LOCAL_SRC_FILES := ../../../lib/ljpeg/jcapimin.c \
../../../source/2d/assets/ParticleAssetEmitter.cc \
../../../source/2d/assets/ParticleAssetField.cc \
../../../source/2d/assets/ParticleAssetFieldCollection.cc \
../../../source/2d/assets/SkeletonAsset.cc \
../../../source/2d/controllers/AmbientForceController.cc \
../../../source/2d/controllers/BuoyancyController.cc \
../../../source/2d/controllers/core/GroupedSceneController.cc \
Expand Down Expand Up @@ -204,6 +205,7 @@ LOCAL_SRC_FILES := ../../../lib/ljpeg/jcapimin.c \
../../../source/2d/sceneobject/SceneObjectSet.cc \
../../../source/2d/sceneobject/Scroller.cc \
../../../source/2d/sceneobject/ShapeVector.cc \
../../../source/2d/sceneobject/SkeletonObject.cc \
../../../source/2d/sceneobject/Sprite.cc \
../../../source/2d/sceneobject/Trigger.cc \
../../../source/2d/scene/ContactFilter.cc \
Expand Down Expand Up @@ -338,8 +340,6 @@ LOCAL_SRC_FILES := ../../../lib/ljpeg/jcapimin.c \
../../../source/gui/language/lang.cc \
../../../source/gui/messageVector.cc \
../../../source/input/actionMap.cc \
../../../source/input/leapMotion/leapMotionManager.cc \
../../../source/input/leapMotion/leapMotionUtil.cpp \
../../../source/io/bitStream.cc \
../../../source/io/bufferStream.cc \
../../../source/io/fileObject.cc \
Expand Down Expand Up @@ -509,6 +509,28 @@ LOCAL_SRC_FILES := ../../../lib/ljpeg/jcapimin.c \
../../../source/sim/SimObjectList.cc \
../../../source/sim/simSerialize.cpp \
../../../source/sim/simSet.cc \
../../../source/spine/Animation.c \
../../../source/spine/AnimationState.c \
../../../source/spine/AnimationStateData.c \
../../../source/spine/Atlas.c \
../../../source/spine/AtlasAttachmentLoader.c \
../../../source/spine/Attachment.c \
../../../source/spine/AttachmentLoader.c \
../../../source/spine/Bone.c \
../../../source/spine/BoneData.c \
../../../source/spine/BoundingBoxAttachment.c \
../../../source/spine/Event.c \
../../../source/spine/EventData.c \
../../../source/spine/extension.c \
../../../source/spine/Json.c \
../../../source/spine/RegionAttachment.c \
../../../source/spine/Skeleton.c \
../../../source/spine/SkeletonBounds.c \
../../../source/spine/SkeletonData.c \
../../../source/spine/SkeletonJson.c \
../../../source/spine/Skin.c \
../../../source/spine/Slot.c \
../../../source/spine/SlotData.c \
../../../source/string/findMatch.cc \
../../../source/string/stringBuffer.cc \
../../../source/string/stringStack.cc \
Expand Down
2 changes: 1 addition & 1 deletion engine/source/platformAndroid/AndroidConsole.h
View file
Expand Up @@ -27,7 +27,7 @@
#include "console/console.h"
#endif
#ifndef _EVENT_H_
#include "Platform/event.h"
#include "platform/event.h"
#endif


Expand Down
2 changes: 1 addition & 1 deletion engine/source/platformAndroid/AndroidDialogs.cpp
View file
Expand Up @@ -26,7 +26,7 @@
#include "platform/threads/mutex.h"
#include "memory/safeDelete.h"
#include "math/mMath.h"
#include "string/Unicode.h"
#include "string/unicode.h"
#include "console/consoleTypes.h"
#include "platform/threads/thread.h"

Expand Down
2 changes: 1 addition & 1 deletion engine/source/platformAndroid/AndroidFont.cpp
View file
Expand Up @@ -23,7 +23,7 @@
#include "platform/platform.h"
#include "platformAndroid/platformAndroid.h"
#include "platformAndroid/AndroidFont.h"
#include "string/Unicode.h"
#include "string/unicode.h"
#include <sstream>

//------------------------------------------------------------------------------
Expand Down
20 changes: 10 additions & 10 deletions engine/source/platformAndroid/AndroidInput.cpp
View file
Expand Up @@ -27,7 +27,7 @@
#include "platform/event.h"
#include "console/console.h"
#include "game/gameInterface.h"
#include "string/Unicode.h"
#include "string/unicode.h"
#include "gui/guiCanvas.h"


Expand Down Expand Up @@ -683,9 +683,9 @@ int processMultipleTouches()
touchEvent.action = SI_TOUCH;
touchEvent.objType = SI_TOUCHDOWN;

dStrcpy(touchEvent.touchesX, posX);
dStrcpy(touchEvent.touchesY, posY);
dStrcpy(touchEvent.touchIDs, touchNums);
dStrcpy(touchEvent.fingersX, posX);
dStrcpy(touchEvent.fingersY, posY);
dStrcpy(touchEvent.fingerIDs, touchNums);

touchEvent.modifier = 0;

Expand Down Expand Up @@ -728,9 +728,9 @@ int processMultipleTouches()
touchEvent.action = SI_TOUCH;
touchEvent.objType = SI_TOUCHMOVE;

dStrcpy(touchEvent.touchesX, posX);
dStrcpy(touchEvent.touchesY, posY);
dStrcpy(touchEvent.touchIDs, touchNums);
dStrcpy(touchEvent.fingersX, posX);
dStrcpy(touchEvent.fingersY, posY);
dStrcpy(touchEvent.fingerIDs, touchNums);

touchEvent.modifier = 0;

Expand Down Expand Up @@ -788,9 +788,9 @@ int processMultipleTouches()
touchEvent.action = SI_TOUCH;
touchEvent.objType = SI_TOUCHUP;

dStrcpy(touchEvent.touchesX, posX);
dStrcpy(touchEvent.touchesY, posY);
dStrcpy(touchEvent.touchIDs, touchNums);
dStrcpy(touchEvent.fingersX, posX);
dStrcpy(touchEvent.fingersY, posY);
dStrcpy(touchEvent.fingerIDs, touchNums);

touchEvent.modifier = 0;

Expand Down

0 comments on commit 38ea160

Please sign in to comment.