closes #39

assets/Config/keybinds.json.backup

@@ -1,51 +0,0 @@
-{
-    "state": "TITLE_MENU",
-    "controlsMap": {
-        "moveForward": 87,
-        "menuType9": 57,
-        "menuTypeBackspace": 259,
-        "moveBackward": 83,
-        "menuType0": 48,
-        "menuType.": 46,
-        "fall": 341,
-        "moveRight": 68,
-        "menuSelect": 257,
-        "menuType7": 55,
-        "menuDecrement": 265,
-        "menuBackout": 256,
-        "menuType8": 56,
-        "moveLeft": 65,
-        "menuType5": 53,
-        "menuType6": 54,
-        "menuType3": 51,
-        "menuType4": 52,
-        "menuIncrement": 264,
-        "menuType1": 49,
-        "jump": 32,
-        "menuType2": 50
-    },
-    "controlsState": {
-        "moveForward": false,
-        "menuType9": false,
-        "menuTypeBackspace": false,
-        "moveBackward": false,
-        "menuType0": false,
-        "menuType.": false,
-        "fall": false,
-        "moveRight": false,
-        "menuSelect": false,
-        "menuType7": false,
-        "menuDecrement": false,
-        "menuBackout": false,
-        "menuType8": false,
-        "moveLeft": false,
-        "menuType5": false,
-        "menuType6": false,
-        "menuType3": false,
-        "menuType4": false,
-        "menuIncrement": false,
-        "menuType1": false,
-        "jump": false,
-        "menuType2": false
-    }
-}

assets/Data/items.json

@@ -28,6 +28,15 @@
                 "WEAPON",
                 "MELEE"
             ]
+        },
+        {
+            "name" : "Bow",
+            "modelPath": "Models/bow1.fbx",
+            "tokens" : [
+                "BLENDER_TRANSFORM",
+                "WEAPON",
+                "RANGED"
+            ]
         }
 
 

assets/Textures/default_texture_map.json

@@ -113,6 +113,12 @@
                 "/Textures/deer1.png",
                 "/Textures/deer1.png"
             ]
+        },
+        "Models/bow1.fbx" : {
+            "BowMesh" : [
+                "/Textures/bow1.png",
+                "/Textures/bow1.png"
+            ]
         }
     }
 }

src/main/java/electrosphere/main/Main.java

@@ -161,7 +161,7 @@ public class Main {
 //        }
 
         
-        
+
         //debug: create terrain/world viewer
 //        TerrainViewer.runViewer();
         
@@ -169,6 +169,15 @@ public class Main {
         Globals.renderingEngine = new RenderingEngine();
         Globals.renderingEngine.createOpenglContext();
         
+        //uncomment to test loading a model into engine
+//        if(1==1){
+//            Globals.assetManager.addModelPathToQueue("/Models/bow1.fbx");
+//            Globals.assetManager.loadAssetsInQueue();
+//            Model bowModel = Globals.assetManager.fetchModel("/Models/bow1.fbx");
+//            bowModel.describeHighLevel();
+//            System.exit(0);
+//        }
+        
         //create the audio context
         Globals.audioEngine = new AudioEngine();
         Globals.audioEngine.init();