diff --git a/Templates/SalmonUniversalTemplate/assets/bt_box_yellow.bmp b/Templates/SalmonUniversalTemplate/assets/bt_box_yellow.bmp deleted file mode 100644 index b7a2d6f..0000000 Binary files a/Templates/SalmonUniversalTemplate/assets/bt_box_yellow.bmp and /dev/null differ diff --git a/Templates/SalmonUniversalTemplate/assets/bt_box_yellow.jpg b/Templates/SalmonUniversalTemplate/assets/bt_box_yellow.jpg new file mode 100644 index 0000000..c8fe92f Binary files /dev/null and b/Templates/SalmonUniversalTemplate/assets/bt_box_yellow.jpg differ diff --git a/Templates/SalmonUniversalTemplate/assets/bt_box_yellow.tga b/Templates/SalmonUniversalTemplate/assets/bt_box_yellow.tga new file mode 100644 index 0000000..534a84b Binary files /dev/null and b/Templates/SalmonUniversalTemplate/assets/bt_box_yellow.tga differ diff --git a/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_bitmap.jpg b/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_bitmap.jpg new file mode 100644 index 0000000..c268f46 Binary files /dev/null and b/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_bitmap.jpg differ diff --git a/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_bitmap.png b/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_bitmap.png new file mode 100644 index 0000000..dbbfc2a Binary files /dev/null and b/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_bitmap.png differ diff --git a/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_bitmap.tga b/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_bitmap.tga new file mode 100644 index 0000000..9320413 Binary files /dev/null and b/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_bitmap.tga differ diff --git a/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_charmap.txt b/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_charmap.txt index f17cd0b..f52ac4c 100644 --- a/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_charmap.txt +++ b/Templates/SalmonUniversalTemplate/assets/droid_sans14_font_charmap.txt @@ -1,95 +1,96 @@ -32 0.00976562 0.0195312 0 0.0546875 0 0 0.0078125 -49 0.0195312 0.0195312 0.00390625 0.015625 0.0078125 0.0390625 0.015625 -50 0.0371094 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.015625 -51 0.0605469 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625 -52 0.0820312 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.015625 -53 0.105469 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625 -54 0.126953 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625 -55 0.148438 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625 -56 0.169922 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625 -57 0.191406 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625 -48 0.212891 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.015625 -97 0.234375 0.0195312 0.00195312 0.0234375 0.00976562 0.03125 0.0136719 -98 0.253906 0.0195312 0.00195312 0.0117188 0.0117188 0.0429688 0.015625 -99 0.275391 0.0195312 0.00195312 0.0234375 0.00976562 0.03125 0.0136719 -100 0.294922 0.0195312 0.00195312 0.0117188 0.0117188 0.0429688 0.015625 -101 0.316406 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625 -102 0.337891 0.0195312 0 0.0117188 0.00976562 0.0429688 0.0078125 -103 0.357422 0.0195312 0.00195312 0.0234375 0.0136719 0.0429688 0.0136719 -104 0.380859 0.0195312 0.00195312 0.0117188 0.0117188 0.0429688 0.015625 -105 0.402344 0.0195312 0 0.0117188 0.00585938 0.0429688 0.0078125 -106 0.417969 0.0195312 -0.00195312 0.0117188 0.0078125 0.0546875 0.0078125 -107 0.435547 0.0195312 0.00195312 0.0117188 0.0136719 0.0429688 0.0136719 -108 0.458984 0.0195312 0.00195312 0.0117188 0.00390625 0.0429688 0.0078125 -109 0.472656 0.0195312 0.00195312 0.0234375 0.0214844 0.03125 0.0253906 -110 0.503906 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625 -111 0.525391 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625 -112 0.546875 0.0195312 0.00195312 0.0234375 0.0117188 0.0429688 0.015625 -113 0.568359 0.0195312 0.00195312 0.0234375 0.0117188 0.0429688 0.015625 -114 0.589844 0.0195312 0.00195312 0.0234375 0.0078125 0.03125 0.00976562 -115 0.607422 0.0195312 0 0.0234375 0.0117188 0.03125 0.0136719 -116 0.628906 0.0195312 0 0.015625 0.00976562 0.0390625 0.00976562 -117 0.648438 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.015625 -118 0.669922 0.0195312 -0.00195312 0.0234375 0.0175781 0.03125 0.0136719 -119 0.697266 0.0195312 -0.00195312 0.0234375 0.0234375 0.03125 0.0195312 -120 0.730469 0.0195312 0 0.0234375 0.0136719 0.03125 0.0136719 -121 0.753906 0.0195312 -0.00195312 0.0234375 0.0175781 0.0429688 0.0136719 -122 0.78125 0.0195312 0.00195312 0.0234375 0.0117188 0.03125 0.0136719 -65 0.802734 0.0195312 -0.00195312 0.015625 0.0214844 0.0390625 0.0175781 -66 0.833984 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.0175781 -67 0.857422 0.0195312 0.00195312 0.015625 0.0136719 0.0390625 0.015625 -68 0.880859 0.0195312 0.00195312 0.015625 0.015625 0.0390625 0.0195312 -69 0.90625 0.0195312 0.00195312 0.015625 0.00976562 0.0390625 0.0136719 -70 0.925781 0.0195312 0.00195312 0.015625 0.0117188 0.0390625 0.0136719 -71 0.947266 0.0195312 0.00195312 0.015625 0.015625 0.0390625 0.0195312 -72 0.00976562 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.0195312 -73 0.0351562 0.09375 0 0.015625 0.00976562 0.0390625 0.00976562 -74 0.0546875 0.09375 -0.00390625 0.015625 0.00976562 0.0507812 0.00585938 -75 0.0742188 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.015625 -76 0.0996094 0.09375 0.00195312 0.015625 0.0117188 0.0390625 0.0136719 -77 0.121094 0.09375 0.00195312 0.015625 0.0195312 0.0390625 0.0234375 -78 0.150391 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.0195312 -79 0.175781 0.09375 0.00195312 0.015625 0.0175781 0.0390625 0.0214844 -80 0.203125 0.09375 0.00195312 0.015625 0.0117188 0.0390625 0.015625 -81 0.224609 0.09375 0.00195312 0.015625 0.0175781 0.046875 0.0214844 -82 0.251953 0.09375 0.00195312 0.015625 0.0136719 0.0390625 0.015625 -83 0.275391 0.09375 0 0.015625 0.0136719 0.0390625 0.0136719 -84 0.298828 0.09375 0 0.015625 0.0136719 0.0390625 0.0136719 -85 0.322266 0.09375 0.00195312 0.015625 0.015625 0.0390625 0.0195312 -86 0.347656 0.09375 -0.00195312 0.015625 0.0195312 0.0390625 0.015625 -87 0.376953 0.09375 -0.00195312 0.015625 0.0292969 0.0390625 0.0253906 -88 0.416016 0.09375 -0.00195312 0.015625 0.0195312 0.0390625 0.015625 -89 0.445312 0.09375 -0.00195312 0.015625 0.0175781 0.0390625 0.0136719 -90 0.472656 0.09375 0.00195312 0.015625 0.0117188 0.0390625 0.015625 -46 0.494141 0.09375 0.00195312 0.046875 0.00390625 0.0078125 0.0078125 -44 0.507812 0.09375 0.00195312 0.046875 0.00390625 0.0117188 0.0078125 -58 0.521484 0.09375 0.00195312 0.0234375 0.00390625 0.03125 0.0078125 -59 0.535156 0.09375 0.00195312 0.0234375 0.00390625 0.0351562 0.0078125 -64 0.548828 0.09375 0.00195312 0.015625 0.0195312 0.0429688 0.0234375 -35 0.578125 0.09375 0 0.015625 0.015625 0.0390625 0.0175781 -36 0.603516 0.09375 0.00195312 0.0117188 0.0117188 0.046875 0.015625 -37 0.625 0.09375 0.00195312 0.015625 0.0195312 0.0390625 0.0234375 -94 0.654297 0.09375 0 0.015625 0.0136719 0.0234375 0.0136719 -38 0.677734 0.09375 0.00195312 0.015625 0.0175781 0.0390625 0.0195312 -42 0.705078 0.09375 0 0.0117188 0.0136719 0.0234375 0.015625 -33 0.728516 0.09375 0.00195312 0.015625 0.00390625 0.0390625 0.0078125 -63 0.742188 0.09375 0 0.015625 0.00976562 0.0390625 0.0117188 -40 0.761719 0.09375 0.00195312 0.015625 0.0078125 0.046875 0.0078125 -41 0.779297 0.09375 0 0.015625 0.00585938 0.046875 0.0078125 -91 0.794922 0.09375 0.00195312 0.015625 0.00585938 0.046875 0.0078125 -93 0.810547 0.09375 0 0.015625 0.00585938 0.046875 0.0078125 -123 0.826172 0.09375 0 0.015625 0.00976562 0.046875 0.00976562 -125 0.845703 0.09375 0 0.015625 0.00976562 0.046875 0.00976562 -60 0.865234 0.09375 0.00195312 0.0234375 0.0117188 0.0273438 0.015625 -62 0.886719 0.09375 0.00195312 0.0234375 0.0117188 0.0273438 0.015625 -95 0.908203 0.09375 0 0.0585938 0.0117188 0.00390625 0.0117188 -45 0.929688 0.09375 0.00195312 0.0390625 0.00585938 0.0078125 0.00976562 -43 0.945312 0.09375 0 0.0234375 0.0136719 0.0273438 0.015625 -61 0.00976562 0.167969 0 0.0273438 0.0136719 0.0195312 0.015625 -124 0.0332031 0.167969 0.00585938 0.0117188 0.00390625 0.0546875 0.0136719 -92 0.046875 0.167969 -0.00195312 0.015625 0.0136719 0.0390625 0.00976562 -47 0.0703125 0.167969 -0.00195312 0.015625 0.0136719 0.0390625 0.00976562 -126 0.09375 0.167969 0.00195312 0.03125 0.0117188 0.0117188 0.015625 -96 0.115234 0.167969 0.00585938 0.0117188 0.00585938 0.0078125 0.015625 -34 0.130859 0.167969 0.00195312 0.015625 0.00976562 0.015625 0.0117188 -39 0.150391 0.167969 0.00195312 0.015625 0.00390625 0.015625 0.00585938 \ No newline at end of file +32 0.0195312 0.0390625 0 0.109375 0 0 0.015625 +49 0.0390625 0.0390625 0.0078125 0.03125 0.015625 0.078125 0.03125 +50 0.0742188 0.0390625 0.00390625 0.03125 0.0273438 0.078125 0.03125 +51 0.121094 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125 +52 0.164062 0.0390625 0.00390625 0.03125 0.0273438 0.078125 0.03125 +53 0.210938 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125 +54 0.253906 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125 +55 0.296875 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125 +56 0.339844 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125 +57 0.382812 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125 +48 0.425781 0.0390625 0.00390625 0.03125 0.0234375 0.078125 0.03125 +97 0.46875 0.0390625 0.00390625 0.046875 0.0195312 0.0625 0.0273438 +98 0.507812 0.0390625 0.00390625 0.0234375 0.0234375 0.0859375 0.03125 +99 0.550781 0.0390625 0.00390625 0.046875 0.0195312 0.0625 0.0273438 +100 0.589844 0.0390625 0.00390625 0.0234375 0.0234375 0.0859375 0.03125 +101 0.632812 0.0390625 0.00390625 0.046875 0.0234375 0.0625 0.03125 +102 0.675781 0.0390625 0 0.0234375 0.0195312 0.0859375 0.015625 +103 0.714844 0.0390625 0.00390625 0.046875 0.0273438 0.0859375 0.0273438 +104 0.761719 0.0390625 0.00390625 0.0234375 0.0234375 0.0859375 0.03125 +105 0.804688 0.0390625 0 0.0234375 0.0117188 0.0859375 0.015625 +106 0.835938 0.0390625 -0.00390625 0.0234375 0.015625 0.109375 0.015625 +107 0.871094 0.0390625 0.00390625 0.0234375 0.0273438 0.0859375 0.0273438 +108 0.917969 0.0390625 0.00390625 0.0234375 0.0078125 0.0859375 0.015625 +109 0.945312 0.0390625 0.00390625 0.046875 0.0429688 0.0625 0.0507812 +110 0.0195312 0.1875 0.00390625 0.046875 0.0234375 0.0625 0.03125 +111 0.0625 0.1875 0.00390625 0.046875 0.0234375 0.0625 0.03125 +112 0.105469 0.1875 0.00390625 0.046875 0.0234375 0.0859375 0.03125 +113 0.148438 0.1875 0.00390625 0.046875 0.0234375 0.0859375 0.03125 +114 0.191406 0.1875 0.00390625 0.046875 0.015625 0.0625 0.0195312 +115 0.226562 0.1875 0 0.046875 0.0234375 0.0625 0.0273438 +116 0.269531 0.1875 0 0.03125 0.0195312 0.078125 0.0195312 +117 0.308594 0.1875 0.00390625 0.046875 0.0234375 0.0625 0.03125 +118 0.351562 0.1875 -0.00390625 0.046875 0.0351562 0.0625 0.0273438 +119 0.40625 0.1875 -0.00390625 0.046875 0.046875 0.0625 0.0390625 +120 0.472656 0.1875 0 0.046875 0.0273438 0.0625 0.0273438 +121 0.519531 0.1875 -0.00390625 0.046875 0.0351562 0.0859375 0.0273438 +122 0.574219 0.1875 0.00390625 0.046875 0.0234375 0.0625 0.0273438 +65 0.617188 0.1875 -0.00390625 0.03125 0.0429688 0.078125 0.0351562 +66 0.679688 0.1875 0.00390625 0.03125 0.0273438 0.078125 0.0351562 +67 0.726562 0.1875 0.00390625 0.03125 0.0273438 0.078125 0.03125 +68 0.773438 0.1875 0.00390625 0.03125 0.03125 0.078125 0.0390625 +69 0.824219 0.1875 0.00390625 0.03125 0.0195312 0.078125 0.0273438 +70 0.863281 0.1875 0.00390625 0.03125 0.0234375 0.078125 0.0273438 +71 0.90625 0.1875 0.00390625 0.03125 0.03125 0.078125 0.0390625 +72 0.0195312 0.335938 0.00390625 0.03125 0.03125 0.078125 0.0390625 +73 0.0703125 0.335938 0 0.03125 0.0195312 0.078125 0.0195312 +74 0.109375 0.335938 -0.0078125 0.03125 0.0195312 0.101562 0.0117188 +75 0.148438 0.335938 0.00390625 0.03125 0.03125 0.078125 0.03125 +76 0.199219 0.335938 0.00390625 0.03125 0.0234375 0.078125 0.0273438 +77 0.242188 0.335938 0.00390625 0.03125 0.0390625 0.078125 0.046875 +78 0.300781 0.335938 0.00390625 0.03125 0.03125 0.078125 0.0390625 +79 0.351562 0.335938 0.00390625 0.03125 0.0351562 0.078125 0.0429688 +80 0.40625 0.335938 0.00390625 0.03125 0.0234375 0.078125 0.03125 +81 0.449219 0.335938 0.00390625 0.03125 0.0351562 0.09375 0.0429688 +82 0.503906 0.335938 0.00390625 0.03125 0.0273438 0.078125 0.03125 +83 0.550781 0.335938 0 0.03125 0.0273438 0.078125 0.0273438 +84 0.597656 0.335938 0 0.03125 0.0273438 0.078125 0.0273438 +85 0.644531 0.335938 0.00390625 0.03125 0.03125 0.078125 0.0390625 +86 0.695312 0.335938 -0.00390625 0.03125 0.0390625 0.078125 0.03125 +87 0.753906 0.335938 -0.00390625 0.03125 0.0585938 0.078125 0.0507812 +88 0.832031 0.335938 -0.00390625 0.03125 0.0390625 0.078125 0.03125 +89 0.890625 0.335938 -0.00390625 0.03125 0.0351562 0.078125 0.0273438 +90 0.0195312 0.484375 0.00390625 0.03125 0.0234375 0.078125 0.03125 +46 0.0625 0.484375 0.00390625 0.09375 0.0078125 0.015625 0.015625 +44 0.0898438 0.484375 0.00390625 0.09375 0.0078125 0.0234375 0.015625 +58 0.117188 0.484375 0.00390625 0.046875 0.0078125 0.0625 0.015625 +59 0.144531 0.484375 0.00390625 0.046875 0.0078125 0.0703125 0.015625 +64 0.171875 0.484375 0.00390625 0.03125 0.0390625 0.0859375 0.046875 +35 0.230469 0.484375 0 0.03125 0.03125 0.078125 0.0351562 +36 0.28125 0.484375 0.00390625 0.0234375 0.0234375 0.09375 0.03125 +37 0.324219 0.484375 0.00390625 0.03125 0.0390625 0.078125 0.046875 +94 0.382812 0.484375 0 0.03125 0.0273438 0.046875 0.0273438 +38 0.429688 0.484375 0.00390625 0.03125 0.0351562 0.078125 0.0390625 +42 0.484375 0.484375 0 0.0234375 0.0273438 0.046875 0.03125 +33 0.53125 0.484375 0.00390625 0.03125 0.0078125 0.078125 0.015625 +63 0.558594 0.484375 0 0.03125 0.0195312 0.078125 0.0234375 +40 0.597656 0.484375 0.00390625 0.03125 0.015625 0.09375 0.015625 +41 0.632812 0.484375 0 0.03125 0.0117188 0.09375 0.015625 +91 0.664062 0.484375 0.00390625 0.03125 0.0117188 0.09375 0.015625 +93 0.695312 0.484375 0 0.03125 0.0117188 0.09375 0.015625 +123 0.726562 0.484375 0 0.03125 0.0195312 0.09375 0.0195312 +125 0.765625 0.484375 0 0.03125 0.0195312 0.09375 0.0195312 +60 0.804688 0.484375 0.00390625 0.046875 0.0234375 0.0546875 0.03125 +62 0.847656 0.484375 0.00390625 0.046875 0.0234375 0.0546875 0.03125 +95 0.890625 0.484375 0 0.117188 0.0234375 0.0078125 0.0234375 +45 0.933594 0.484375 0.00390625 0.078125 0.0117188 0.015625 0.0195312 +43 0.0195312 0.632812 0 0.046875 0.0273438 0.0546875 0.03125 +61 0.0664062 0.632812 0 0.0546875 0.0273438 0.0390625 0.03125 +124 0.113281 0.632812 0.0117188 0.0234375 0.0078125 0.109375 0.0273438 +92 0.140625 0.632812 -0.00390625 0.03125 0.0273438 0.078125 0.0195312 +47 0.1875 0.632812 -0.00390625 0.03125 0.0273438 0.078125 0.0195312 +126 0.234375 0.632812 0.00390625 0.0625 0.0234375 0.0234375 0.03125 +96 0.277344 0.632812 0.0117188 0.0234375 0.0117188 0.015625 0.03125 +34 0.308594 0.632812 0.00390625 0.03125 0.0195312 0.03125 0.0234375 +39 0.347656 0.632812 0.00390625 0.03125 0.0078125 0.03125 0.0117188 +169 0.375 0.632812 0.00390625 0.03125 0.0390625 0.078125 0.046875 diff --git a/Templates/SalmonUniversalTemplate/assets/model.xml b/Templates/SalmonUniversalTemplate/assets/model.xml index a406ac9..75bc36a 100644 --- a/Templates/SalmonUniversalTemplate/assets/model.xml +++ b/Templates/SalmonUniversalTemplate/assets/model.xml @@ -1,6 +1,6 @@ - + diff --git a/Templates/SalmonUniversalTemplate/jni/Android.mk b/Templates/SalmonUniversalTemplate/jni/Android.mk index d648ff4..4be3613 100644 --- a/Templates/SalmonUniversalTemplate/jni/Android.mk +++ b/Templates/SalmonUniversalTemplate/jni/Android.mk @@ -28,6 +28,9 @@ SQUIRREL_PATH = $(LibsPathCygwin)/sqplus LIBPNG_PATH = $(LibsPathCygwin)/libpng_1.4.1_android +LIBJPEG_PATH = $(LibsPathCygwin)/jpeg-9 + + ZIP_PATH = $(LibsPathCygwin)/julienr-libzip-android/jni #====== ENGINE AND LIBS ===================== @@ -45,6 +48,7 @@ LOCAL_CFLAGS := -DTARGET_ANDROID -DNOSOUND -std=gnu++11 --std=c++11 LOCAL_STATIC_LIBRARIES := boost LOCAL_STATIC_LIBRARIES += squirrel LOCAL_STATIC_LIBRARIES += png_lib +LOCAL_STATIC_LIBRARIES += jpeg LOCAL_STATIC_LIBRARIES += zip LOCAL_SHARED_LIBRARIES := SalmonEngine LOCAL_SHARED_LIBRARIES += gnustl_shared @@ -62,7 +66,10 @@ 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 += $(LIBJPEG_PATH) +LOCAL_C_INCLUDES += $(LIBJPEG_PATH)/vc10 LOCAL_C_INCLUDES += $(ZIP_PATH) + LOCAL_MODULE := SalmonJniTemplate LOCAL_SRC_FILES := main_code.cpp LOCAL_SRC_FILES += android_api.cpp diff --git a/Templates/SalmonUniversalTemplate/src/fishrungames/salmonjnitemplate/MainActivity.java b/Templates/SalmonUniversalTemplate/src/fishrungames/salmonjnitemplate/MainActivity.java index ca51357..8bb1a98 100644 --- a/Templates/SalmonUniversalTemplate/src/fishrungames/salmonjnitemplate/MainActivity.java +++ b/Templates/SalmonUniversalTemplate/src/fishrungames/salmonjnitemplate/MainActivity.java @@ -52,6 +52,9 @@ public class MainActivity extends Activity setContentView(mView); + + EngineWrapper.SetView(mView); + } @Override