Merge pull request #17 from Arctic76/dev

Dev

.gitignore

@@ -216,5 +216,4 @@ pip-log.txt
 .mr.developer.cfg
 
 #Perso
-
 *.ico

README.md

@@ -1,24 +1,15 @@
-# Space Rocket
+[![Version](https://img.shields.io/badge/version-1.0-green.svg)](https://img.shields.io/badge/version-1.1-green.svg) [![Build status](https://img.shields.io/badge/build-passing-green.svg)](https://img.shields.io/badge/build-passing-green.svg) [![Platform](https://img.shields.io/badge/platform-OS%20X%20%7C%20Windows-lightgrey.svg)](https://img.shields.io/badge/platform-OS%20X%20%7C%20Windows-lightgrey.svg)
 
-Java project realized in IMAC Engineering School, in April and May 2016. It works on Eclipse with Processing.
 
-**Supported OS :**
+# Space Rocket 🚀
 
-- Mac OSX
-- Windows
+Java project realized in IMAC Engineering School, in April and May 2016. It works on Eclipse with Processing. Control your rocket to avoid the maximum of meteros. Have fun !
 
-## How to use it
+## Set up Space-Rocket
 
 #### Clone the project
 
 	git clone https://github.com/Arctic76/Space-Rocket.git
-
-#### Download and copy / paste lib files
-
-- Go to [Drive](https://www.eclipse.org/downloads/)
-- Go to your good OS folder
-- Download all files
-- Put them in the `processing` folder in `lib` project folder
 
 #### Create a Eclipse project
 
@@ -28,13 +19,57 @@ Java project realized in IMAC Engineering School, in April and May 2016. It work
 - Click on Next and **verify** if all library files have been imported
 - Finish
 
+#### Add libraries
+
+If some librairies are not detected, you have to add the JAR files to each of them.
+
+- In Eclipse, go to *Project* > *Properties*
+- Go to the subcategory *Java Build Path*
+- Go to the tab Libraries
+- Click on *Add JARs*
+- Go to *Space-Rocket/lib/*
+- Add JAR file for each library (for LeapMotion and Processing libs, select your good OS folder)
+- **Apply** and click OK
+
+#### Check the Native Location for LeapMotion lib
+
+- In Eclipse, go to *Project* > *Properties*
+- Go to the subcategory *Java Build Path*
+- Go to the tab *Libraries*
+- **Check** if there is no error. If there are errors:
+    - Check if the file `LeapJava.jar` is detected
+    - Check if the file `LeapJava.jar` is located to the good leapmotion lib OS folder
+    - Check if `Native location library` is configurated with the good leapmotion lib OS folder
+
+- **Apply** and click OK
+
+
 #### Play
 
 - **Connect** your MIDI controller and your Leap Motion
 - **Run** the project on Eclipse
 - **Have fun**
+
+## How to play
+
+#### Select a level
+
+Use your **UP** and **DOWN** keys of your keyboard to choose you level. **Enter** to select it.
+
+#### Control my rocket
+
+Use your **LeapMotion** or your **directionnal keys** of your keyboard.
+
+#### Active a bonus
+
+Use the **pads** number 1, 2, 3, 9 and 10 to active the bonus that you want. You can also use the **keys** 1, 2, 3, 4 and 5 of your keyboard. 
+
+#### Display or hide the menu
+
+You can use the **pad** number 11 to display/hide the menu, but you can also use the **key** "A" of your keyboard.
+
 
 ## Prior installation
 
-You have to download [Eclipse](https://www.eclipse.org/downloads/) and buy a [Leap Motion](https://www.leapmotion.com/).
+You have to download [Eclipse](https://www.eclipse.org/downloads/) and buy a [Leap Motion](https://www.leapmotion.com/) and a [MIDI Controller](https://www.arturia.com/products/hybrid-synths/beatstep). If you don't have neither LeapMotion nor MIDI Controller, you can play with your keyboard. 😎
 

assets/conf/init.json

@@ -0,0 +1,4 @@
+{
+    "numberOfLevel": 3
+}
+

assets/conf/level1.json

@@ -0,0 +1,10 @@
+{
+    "Player_Position": { "x" : 400.0, "y" : 300.0, "z"  : 0.0},
+    "Player_Scale": { "x" : 0.1, "y" : 0.1, "z"  : 0.1},
+    "Player_Score" : 0,
+    "Player_Speed" : 10.0,
+    "Player_Life"  : 10000,
+	"Level_Number" : 1,
+    "Level_NbMeteors" : 100,
+    "Level_SpeedMeteor": { "min" : 1.0, "max" : 5.0}
+}

assets/conf/level2.json

@@ -0,0 +1,11 @@
+{
+    "Player_Position": { "x" : 400.0, "y" : 300.0, "z"  : 0.0},
+    "Player_Scale": { "x" : 0.1, "y" : 0.1, "z"  : 0.1},
+    "Player_Score" : 0,
+    "Player_Speed" : 10.0,
+    "Player_Life"  : 1000,
+	"Level_Number" : 2,
+    "Level_NbMeteors" : 200,
+    "Level_SpeedMeteor": { "min" : 1.0, "max" : 5.0}
+}
+

assets/conf/level3.json

@@ -0,0 +1,10 @@
+{
+    "Player_Position": { "x" : 400.0, "y" : 300.0, "z"  : 0.0},
+    "Player_Scale": { "x" : 0.1, "y" : 0.1, "z"  : 0.1},
+    "Player_Score" : 0,
+    "Player_Speed" : 10.0,
+    "Player_Life"  : 100,
+	"Level_Number" : 3,
+    "Level_NbMeteors" : 400,
+    "Level_SpeedMeteor": { "min" : 1.0, "max" : 5.0}
+}

assets/conf/player.json

@@ -0,0 +1,4 @@
+{
+    "Player_Name" : "Pedro Carlos",
+    "Player_Model" : "rocket.obj"
+}

assets/conf/score.JSON

@@ -0,0 +1 @@
+{"Score":6374,"Name":"Pedro Carlos"}

assets/models/rocket.mtl

@@ -0,0 +1,8 @@
+newmtl rocket:___Default
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd rocket_map.png
+Ni 1.50
+Ks 0.50 0.50 0.50