diff --git a/assets/data/gfx/gui/Anonymous_heart_1.png b/assets/data/gfx/gui/Anonymous_heart_1.png new file mode 100644 index 0000000..289e086 Binary files /dev/null and b/assets/data/gfx/gui/Anonymous_heart_1.png differ diff --git a/assets/data/gfx/gui/down_button.png b/assets/data/gfx/gui/down_button.png new file mode 100644 index 0000000..c098a5a Binary files /dev/null and b/assets/data/gfx/gui/down_button.png differ diff --git a/assets/data/gfx/gui/left_button.png b/assets/data/gfx/gui/left_button.png new file mode 100644 index 0000000..61e6bb2 Binary files /dev/null and b/assets/data/gfx/gui/left_button.png differ diff --git a/assets/data/gfx/gui/right_button.png b/assets/data/gfx/gui/right_button.png new file mode 100644 index 0000000..c29c9f3 Binary files /dev/null and b/assets/data/gfx/gui/right_button.png differ diff --git a/assets/data/gfx/gui/up_button.png b/assets/data/gfx/gui/up_button.png new file mode 100644 index 0000000..4a6d6dc Binary files /dev/null and b/assets/data/gfx/gui/up_button.png differ diff --git a/assets/models/collision_models/bomb_game/robot_arm_col.g3db b/assets/models/collision_models/bomb_game/robot_arm_col.g3db index 2acbecc..9b31fef 100644 Binary files a/assets/models/collision_models/bomb_game/robot_arm_col.g3db and b/assets/models/collision_models/bomb_game/robot_arm_col.g3db differ diff --git a/assets/models/render_models/bomb_game/robot_arm.g3db b/assets/models/render_models/bomb_game/robot_arm.g3db index caecbb1..4e09189 100644 Binary files a/assets/models/render_models/bomb_game/robot_arm.g3db and b/assets/models/render_models/bomb_game/robot_arm.g3db differ diff --git a/assets/shaders/movingBckg/movingBckg_frag.glsl b/assets/shaders/movingBckg/movingBckg_frag.glsl new file mode 100644 index 0000000..b9724cd --- /dev/null +++ b/assets/shaders/movingBckg/movingBckg_frag.glsl @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2014 Miguel Angel Astor Romero + * + * 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. + */ +#ifdef GL_ES +precision mediump float; +#endif + +uniform sampler2D u_texture; +uniform vec2 u_scaling; + +varying vec2 v_texCoords; + +void main(){ + gl_FragColor = texture2D(u_texture, v_texCoords * u_scaling); +} \ No newline at end of file diff --git a/assets/shaders/movingBckg/movingBckg_vert.glsl b/assets/shaders/movingBckg/movingBckg_vert.glsl new file mode 100644 index 0000000..fbd2548 --- /dev/null +++ b/assets/shaders/movingBckg/movingBckg_vert.glsl @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2014 Miguel Angel Astor Romero + * + * 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. + */ +uniform mat4 u_projTrans; +uniform float u_displacement; + +attribute vec4 a_position; +attribute vec2 a_texCoord0; + +varying vec2 v_texCoords; + +void main(){ + v_texCoords = a_texCoord0 + u_displacement; + gl_Position = u_projTrans * a_position; +} \ No newline at end of file diff --git a/jni/Android.mk b/jni/Android.mk index 8c132e2..c5b830b 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -5,7 +5,6 @@ include $(CLEAR_VARS) OPENCV_CAMERA_MODULES:=off OPENCV_LIB_TYPE:=STATIC #SHARED include C:\Users\miguel.astor\Documents\OpenCV-2.4.8-android-sdk\sdk\native\jni\OpenCV.mk -#include C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\jni\OpenCV-tegra3.mk LOCAL_MODULE := cvproc LOCAL_SRC_FILES := cv_proc.cpp marker.cpp @@ -31,62 +30,62 @@ include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ocv_tegra_java -LOCAL_SRC_FILES := C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\libs\tegra3\libopencv_java.so +LOCAL_SRC_FILES := C:\\Users\\miguel.astor\\Documents\\OpenCV-2.4.8-android-sdk\\sdk\\native\\libs\\armeabi-v7a\\libopencv_java.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ocv_tegra_info -LOCAL_SRC_FILES := C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\libs\tegra3\libopencv_info.so +LOCAL_SRC_FILES := C:\\Users\\miguel.astor\\Documents\\OpenCV-2.4.8-android-sdk\\sdk\\native\\libs\\armeabi-v7a\\libopencv_info.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ocv_tegra_native_camera_220 -LOCAL_SRC_FILES := C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\libs\tegra3\libnative_camera_r2.2.0.so +LOCAL_SRC_FILES := C:\\Users\\miguel.astor\\Documents\\OpenCV-2.4.8-android-sdk\\sdk\\native\\libs\\armeabi-v7a\\libnative_camera_r2.2.0.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ocv_tegra_native_camera_233 -LOCAL_SRC_FILES := C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\libs\tegra3\libnative_camera_r2.3.3.so +LOCAL_SRC_FILES := C:\\Users\\miguel.astor\\Documents\\OpenCV-2.4.8-android-sdk\\sdk\\native\\libs\\armeabi-v7a\\libnative_camera_r2.3.3.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ocv_tegra_native_camera_301 -LOCAL_SRC_FILES := C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\libs\tegra3\libnative_camera_r3.0.1.so +LOCAL_SRC_FILES := C:\\Users\\miguel.astor\\Documents\\OpenCV-2.4.8-android-sdk\\sdk\\native\\libs\\armeabi-v7a\\libnative_camera_r3.0.1.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ocv_tegra_native_camera_400 -LOCAL_SRC_FILES := C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\libs\tegra3\libnative_camera_r4.0.0.so +LOCAL_SRC_FILES := C:\\Users\\miguel.astor\\Documents\\OpenCV-2.4.8-android-sdk\\sdk\\native\\libs\\armeabi-v7a\\libnative_camera_r4.0.0.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ocv_tegra_native_camera_403 -LOCAL_SRC_FILES := C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\libs\tegra3\libnative_camera_r4.0.3.so +LOCAL_SRC_FILES := C:\\Users\\miguel.astor\\Documents\\OpenCV-2.4.8-android-sdk\\sdk\\native\\libs\\armeabi-v7a\\libnative_camera_r4.0.3.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ocv_tegra_native_camera_411 -LOCAL_SRC_FILES := C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\libs\tegra3\libnative_camera_r4.1.1.so +LOCAL_SRC_FILES := C:\\Users\\miguel.astor\\Documents\\OpenCV-2.4.8-android-sdk\\sdk\\native\\libs\\armeabi-v7a\\libnative_camera_r4.1.1.so include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := ocv_tegra_native_camera_420 -LOCAL_SRC_FILES := C:\NVPACK\OpenCV-2.4.5-Tegra-sdk-r2\sdk\native\libs\tegra3\libnative_camera_r4.2.0.so +LOCAL_SRC_FILES := C:\\Users\\miguel.astor\\Documents\\OpenCV-2.4.8-android-sdk\\sdk\\native\\libs\\armeabi-v7a\\libnative_camera_r4.2.0.so include $(PREBUILT_SHARED_LIBRARY) diff --git a/res/drawable-xhdpi/ouya_icon.png b/res/drawable-xhdpi/ouya_icon.png new file mode 100644 index 0000000..1a93ef4 Binary files /dev/null and b/res/drawable-xhdpi/ouya_icon.png differ