merge

config/settings.json

@@ -1,72 +0,0 @@
-{
-    "root": {
-      "type": "FrameLayout",
-      "x": 0,
-      "y": 0,
-      "width": 1280,
-      "height": 720,
-      "children": [
-        {
-          "type": "FrameLayout",
-          "name": "centerPanel",
-          "x": 480,
-          "y": 160,
-          "width": 320,
-          "height": 400,
-          "children": [
-            {
-              "type": "LinearLayout",
-              "name": "settingsButtons",
-              "orientation": "vertical",
-              "spacing": 10,
-              "x": 0,
-              "y": 0,
-              "width": 300,
-              "height": 300,
-              "children": [
-                  {
-                    "type": "Button",
-                    "name": "Opt1",
-                    "x": 100,
-                    "y": 300,
-                    "width": 200,
-                    "height": 50,
-                    "textures": {
-                      "normal": "./resources/button.png",
-                      "hover": "./resources/button.png",
-                      "pressed": "./resources/button.png"
-                    }
-                  },
-                  {
-                    "type": "Button",
-                    "name": "Opt2",
-                    "x": 100,
-                    "y": 200,
-                    "width": 200,
-                    "height": 50,
-                    "textures": {
-                      "normal": "./resources/button.png",
-                      "hover": "./resources/button.png",
-                      "pressed": "./resources/button.png"
-                    }
-                  },
-                  {
-                    "type": "Button",
-                    "name": "backButton",
-                    "x": 100,
-                    "y": 100,
-                    "width": 200,
-                    "height": 50,
-                    "textures": {
-                      "normal": "./resources/button.png",
-                      "hover": "./resources/button.png",
-                      "pressed": "./resources/button.png"
-                    }
-                  }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  }

config/spark_config.json

@@ -1,22 +0,0 @@
-{
-    "emissionRate": 100.0,
-    "maxParticles": 200,
-    "particleSize": 0.04,
-    "biasX": 0.3,
-    "emissionPoints": [
-        {
-            "position": [-1.3, 0, 0.0]
-        },
-        {
-            "position": [1.3, 0.0, 0.0]
-        }
-    ],
-    "speedRange": [0.5, 2.0],
-    "zSpeedRange": [1.0, 3.0],
-    "scaleRange": [0.8, 1.2],
-    "lifeTimeRange": [600.0, 1400.0],
-    "texture": "./resources/spark.png",
-    "shaderProgramName": "default",
-    "vertexShader": "./shaders/spark.vertex",
-    "fragmentShader": "./shaders/spark.fragment"
-}

config/spark_projectile_config.json

@@ -1,15 +0,0 @@
-{
-    "emissionPoints": [
-      { "position": [0.0, 0.0, 0.0] }
-    ],
-    "texture": "./resources/sand.png",
-    "speedRange": [10.0, 30.0],
-    "zSpeedRange": [-1.0, 1.0],
-    "scaleRange": [0.5, 1.0],
-    "lifeTimeRange": [200.0, 800.0],
-    "emissionRate": 50.0,
-    "maxParticles": 10,
-    "particleSize": 0.09,
-    "biasX": 0.1,
-    "shaderProgramName": "default"
-  }