Merge branch 'develop' of...

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop

assets/game_assets/blueprints/ceiling.json

+{
+	"Transform": {
+		"scale": {
+			"x": 1.0,
+			"y": 1.0,
+			"z": 1.0
+		}
+	},
+	"Model": {
+		"aid": "model:ceiling"
+	},
+	"Shadowcaster": {}
+}

assets/game_assets/blueprints/floor.json

+{
+	"Transform": {
+		"scale": {
+			"x": 1.0,
+			"y": 1.0,
+			"z": 1.0
+		}
+	},
+	"Model": {
+		"aid": "model:floor"
+	},
+	"Shadowcaster": {}
+}

assets/game_assets/blueprints/player.json

 {
 	"Transform": {
 		"scale": {
-			"x": 1.0,
-			"y": 1.0,
-			"z": 1.0
+			"x": 0.015,
+			"y": 0.015,
+			"z": 0.015
 		}
 	},
 	"Model": {
@@ -19,14 +19,26 @@
 	},
 	"Input_controller": {},
 	"Player": {},
-  "Dash": {
-    "attack_width": 0.5
-  },
-  "Stationary_attack": {
-    "radius":  3
-  },
-  "Rigid_body": {
-    "radius": 0.5
-  },
-  "Target": {}
+	"Dash": {
+		"attack_width": 0.5
+	},
+	"Stationary_attack": {
+		"radius": 3
+	},
+	"Rigid_body": {
+		"radius": 0.5
+	},
+	"Target": {},
+	"Pose": {
+		"skeleton": "skel:character"
+	},
+	"Animation": {},
+	"Simple_animation_controller": {
+		"animations": {
+			"idle": "anim:idle"
+		},
+		"current_animation": {
+			"id": "idle"
+		}
+	}
 }

assets/game_assets/blueprints/wall_horizontal.json

+{
+	"Transform": {
+		"scale": {
+			"x": 1.0,
+			"y": 1.0,
+			"z": 1.0
+		}
+	},
+	"Model": {
+		"aid": "model:wall_horizontal"
+	},
+	"Shadowcaster": {}
+}

assets/game_assets/blueprints/wall_vertical.json

+{
+	"Transform": {
+		"scale": {
+			"x": 1.0,
+			"y": 1.0,
+			"z": 1.0
+		}
+	},
+	"Model": {
+		"aid": "model:wall_vertical"
+	},
+	"Shadowcaster": {}
+}

assets/game_assets/level/dummy.lvl

-dummy
+tileset
 ##################
 ##----############
 #|    |---------##

assets/game_assets/level/proto.lvl

@@ -14,4 +14,4 @@ dummy
 ####| h  h  h h   h      -    |#
 ####| h  h  h h               |#
 ####|-------------------------|#
-################################
\ No newline at end of file
+################################

assets/game_assets/materials/ceiling_floor.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "ceiling_floor_albedo.ktx",
+    "normal_aid": "ceiling_floor_normal.ktx",
+    "brdf_aid": "ceiling_floor_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_boots.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_boots.002_albedo.ktx",
+    "normal_aid": "character_boots.002_normal.ktx",
+    "brdf_aid": "character_boots.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_face.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_face.002_albedo.ktx",
+    "normal_aid": "character_face.002_normal.ktx",
+    "brdf_aid": "character_face.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_gelenke.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_gelenke.002_albedo.ktx",
+    "normal_aid": "character_gelenke.002_normal.ktx",
+    "brdf_aid": "character_gelenke.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_glow.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_glow.002_albedo.ktx",
+    "normal_aid": "character_glow.002_normal.ktx",
+    "brdf_aid": "character_glow.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_handschuhe.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_handschuhe.002_albedo.ktx",
+    "normal_aid": "character_handschuhe.002_normal.ktx",
+    "brdf_aid": "character_handschuhe.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_hose.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_hose.002_albedo.ktx",
+    "normal_aid": "character_hose.002_normal.ktx",
+    "brdf_aid": "character_hose.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_rüstung.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_rüstung.002_albedo.ktx",
+    "normal_aid": "character_rüstung.002_normal.ktx",
+    "brdf_aid": "character_rüstung.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/character_sword.002.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "character_sword.002_albedo.ktx",
+    "normal_aid": "character_sword.002_normal.ktx",
+    "brdf_aid": "character_sword.002_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/floor_floor.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "floor_floor_albedo.ktx",
+    "normal_aid": "floor_floor_normal.ktx",
+    "brdf_aid": "floor_floor_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/idle_defaultmaterial.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "idle_defaultmaterial_albedo.ktx",
+    "normal_aid": "idle_defaultmaterial_normal.ktx",
+    "brdf_aid": "idle_defaultmaterial_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/wall_horizontal_glow1.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_horizontal_glow1_albedo.ktx",
+    "normal_aid": "wall_horizontal_glow1_normal.ktx",
+    "brdf_aid": "wall_horizontal_glow1_brdf.ktx",
+    "emission_aid": "white"
+}

assets/game_assets/materials/wall_horizontal_glow2.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_horizontal_glow2_albedo.ktx",
+    "normal_aid": "wall_horizontal_glow2_normal.ktx",
+    "brdf_aid": "wall_horizontal_glow2_brdf.ktx",
+    "emission_aid": "white"
+}

assets/game_assets/materials/wall_horizontal_wall_inner.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_horizontal_wall_inner_albedo.ktx",
+    "normal_aid": "wall_horizontal_wall_inner_normal.ktx",
+    "brdf_aid": "wall_horizontal_wall_inner_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/wall_horizontal_wall_outer.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_horizontal_wall_outer_albedo.ktx",
+    "normal_aid": "wall_horizontal_wall_outer_normal.ktx",
+    "brdf_aid": "wall_horizontal_wall_outer_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/wall_vertical_glow1.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_vertical_glow1_albedo.ktx",
+    "normal_aid": "wall_vertical_glow1_normal.ktx",
+    "brdf_aid": "wall_vertical_glow1_brdf.ktx",
+    "emission_aid": "white"
+}

assets/game_assets/materials/wall_vertical_glow2.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_vertical_glow2_albedo.ktx",
+    "normal_aid": "wall_vertical_glow2_normal.ktx",
+    "brdf_aid": "wall_vertical_glow2_brdf.ktx",
+    "emission_aid": "white"
+}

assets/game_assets/materials/wall_vertical_wall_inner.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_vertical_wall_inner_albedo.ktx",
+    "normal_aid": "wall_vertical_wall_inner_normal.ktx",
+    "brdf_aid": "wall_vertical_wall_inner_brdf.ktx",
+    "emission_aid": ""
+}

assets/game_assets/materials/wall_vertical_wall_outer.msf

+{
+    "substance_id": "default",
+    "albedo_aid": "wall_vertical_wall_outer_albedo.ktx",
+    "normal_aid": "wall_vertical_wall_outer_normal.ktx",
+    "brdf_aid": "wall_vertical_wall_outer_brdf.ktx",
+    "emission_aid": ""
+}