converted character model (materials/textures still missing)

12a12445 · Florian Oetke · cdf17e99 · 12a12445 · 12a12445 · 12a12445
Commit 12a12445 authored Sep 20, 2019 by Florian Oetke
53 changed files
--- a/assets/game_assets/blueprints/player.json
+++ b/assets/game_assets/blueprints/player.json
 {
 	"Transform": {
 		"scale": {
-			"x": 0.5,
+			"x": 1.0,
-			"y": 0.5,
+			"y": 1.0,
-			"z": 0.5
+			"z": 1.0
 		}
 	},
 	"Model": {
-		"aid": "model:drone"
+		"aid": "model:character"
 	},
 	"Shadowcaster": {},
 	"Movement": {

--- a/assets/game_assets/materials/character_default_material.msf
+++ b/assets/game_assets/materials/character_default_material.msf
+{
+    "substance_id": "default",
+    "albedo_aid": "character_default_material_albedo.ktx",
+    "normal_aid": "character_default_material_normal.ktx",
+    "brdf_aid": "character_default_material_brdf.ktx",
+    "emission_aid": ""
+}
--- a/assets/game_assets/materials/character_hose.msf
+++ b/assets/game_assets/materials/character_hose.msf
+{
+    "substance_id": "default",
+    "albedo_aid": "character_hose_albedo.ktx",
+    "normal_aid": "character_hose_normal.ktx",
+    "brdf_aid": "character_hose_brdf.ktx",
+    "emission_aid": ""
+}
--- a/assets/game_assets/models/Character.fbx
+++ b/assets/game_assets/models/Character.fbx
--- a/assets/game_assets/models/character.mmf
+++ b/assets/game_assets/models/character.mmf
--- a/assets/game_assets/textures/character_default_material_albedo.ktx
+++ b/assets/game_assets/textures/character_default_material_albedo.ktx
--- a/assets/game_assets/textures/character_default_material_brdf.ktx
+++ b/assets/game_assets/textures/character_default_material_brdf.ktx
--- a/assets/game_assets/textures/character_default_material_normal.ktx
+++ b/assets/game_assets/textures/character_default_material_normal.ktx
--- a/assets/game_assets/textures/character_hose_albedo.ktx
+++ b/assets/game_assets/textures/character_hose_albedo.ktx
--- a/assets/game_assets/textures/character_hose_brdf.ktx
+++ b/assets/game_assets/textures/character_hose_brdf.ktx
--- a/assets/game_assets/textures/character_hose_normal.ktx
+++ b/assets/game_assets/textures/character_hose_normal.ktx
--- a/assets/game_assets/textures/Character Textures/Character_Boots_BaseColor.png
+++ b/assets/game_assets/textures/Character Textures/Character_Boots_BaseColor.png
--- a/assets/game_assets/textures/Character Textures/Character_Boots_Height.png
+++ b/assets/game_assets/textures/Character Textures/Character_Boots_Height.png
--- a/assets/game_assets/textures/Character Textures/Character_Boots_Metallic.png
+++ b/assets/game_assets/textures/Character Textures/Character_Boots_Metallic.png
--- a/assets/game_assets/textures/Character Textures/Character_Boots_Normal.png
+++ b/assets/game_assets/textures/Character Textures/Character_Boots_Normal.png
--- a/assets/game_assets/textures/Character Textures/Character_Boots_Roughness.png
+++ b/assets/game_assets/textures/Character Textures/Character_Boots_Roughness.png
--- a/assets/game_assets/textures/Character Textures/Character_Face_BaseColor.png
+++ b/assets/game_assets/textures/Character Textures/Character_Face_BaseColor.png
--- a/assets/game_assets/textures/Character Textures/Character_Face_Height.png
+++ b/assets/game_assets/textures/Character Textures/Character_Face_Height.png
--- a/assets/game_assets/textures/Character Textures/Character_Face_Metallic.png
+++ b/assets/game_assets/textures/Character Textures/Character_Face_Metallic.png
--- a/assets/game_assets/textures/Character Textures/Character_Face_Normal.png
+++ b/assets/game_assets/textures/Character Textures/Character_Face_Normal.png
--- a/assets/game_assets/textures/Character Textures/Character_Face_Roughness.png
+++ b/assets/game_assets/textures/Character Textures/Character_Face_Roughness.png
--- a/assets/game_assets/textures/Character Textures/Character_Gelenke_BaseColor.png
+++ b/assets/game_assets/textures/Character Textures/Character_Gelenke_BaseColor.png
--- a/assets/game_assets/textures/Character Textures/Character_Gelenke_Height.png
+++ b/assets/game_assets/textures/Character Textures/Character_Gelenke_Height.png
--- a/assets/game_assets/textures/Character Textures/Character_Gelenke_Metallic.png
+++ b/assets/game_assets/textures/Character Textures/Character_Gelenke_Metallic.png
--- a/assets/game_assets/textures/Character Textures/Character_Gelenke_Normal.png
+++ b/assets/game_assets/textures/Character Textures/Character_Gelenke_Normal.png
--- a/assets/game_assets/textures/Character Textures/Character_Gelenke_Roughness.png
+++ b/assets/game_assets/textures/Character Textures/Character_Gelenke_Roughness.png
--- a/assets/game_assets/textures/Character Textures/Character_Glow_BaseColor.png
+++ b/assets/game_assets/textures/Character Textures/Character_Glow_BaseColor.png
--- a/assets/game_assets/textures/Character Textures/Character_Glow_Height.png
+++ b/assets/game_assets/textures/Character Textures/Character_Glow_Height.png
--- a/assets/game_assets/textures/Character Textures/Character_Glow_Metallic.png
+++ b/assets/game_assets/textures/Character Textures/Character_Glow_Metallic.png
--- a/assets/game_assets/textures/Character Textures/Character_Glow_Normal.png
+++ b/assets/game_assets/textures/Character Textures/Character_Glow_Normal.png
--- a/assets/game_assets/textures/Character Textures/Character_Glow_Roughness.png
+++ b/assets/game_assets/textures/Character Textures/Character_Glow_Roughness.png
--- a/assets/game_assets/textures/Character Textures/Character_Handschuhe_BaseColor.png
+++ b/assets/game_assets/textures/Character Textures/Character_Handschuhe_BaseColor.png
--- a/assets/game_assets/textures/Character Textures/Character_Handschuhe_Height.png
+++ b/assets/game_assets/textures/Character Textures/Character_Handschuhe_Height.png
--- a/assets/game_assets/textures/Character Textures/Character_Handschuhe_Metallic.png
+++ b/assets/game_assets/textures/Character Textures/Character_Handschuhe_Metallic.png
--- a/assets/game_assets/textures/Character Textures/Character_Handschuhe_Normal.png
+++ b/assets/game_assets/textures/Character Textures/Character_Handschuhe_Normal.png
--- a/assets/game_assets/textures/Character Textures/Character_Handschuhe_Roughness.png
+++ b/assets/game_assets/textures/Character Textures/Character_Handschuhe_Roughness.png
--- a/assets/game_assets/textures/Character Textures/Character_Hose_BaseColor.png
+++ b/assets/game_assets/textures/Character Textures/Character_Hose_BaseColor.png
--- a/assets/game_assets/textures/Character Textures/Character_Hose_Height.png
+++ b/assets/game_assets/textures/Character Textures/Character_Hose_Height.png
--- a/assets/game_assets/textures/Character Textures/Character_Hose_Metallic.png
+++ b/assets/game_assets/textures/Character Textures/Character_Hose_Metallic.png
--- a/assets/game_assets/textures/Character Textures/Character_Hose_Normal.png
+++ b/assets/game_assets/textures/Character Textures/Character_Hose_Normal.png
--- a/assets/game_assets/textures/Character Textures/Character_Hose_Roughness.png
+++ b/assets/game_assets/textures/Character Textures/Character_Hose_Roughness.png
--- a/assets/game_assets/textures/Character Textures/Character_Rüstung_BaseColor.png
+++ b/assets/game_assets/textures/Character Textures/Character_Rüstung_BaseColor.png
--- a/assets/game_assets/textures/Character Textures/Character_Rüstung_Height.png
+++ b/assets/game_assets/textures/Character Textures/Character_Rüstung_Height.png
--- a/assets/game_assets/textures/Character Textures/Character_Rüstung_Metallic.png
+++ b/assets/game_assets/textures/Character Textures/Character_Rüstung_Metallic.png
--- a/assets/game_assets/textures/Character Textures/Character_Rüstung_Normal.png
+++ b/assets/game_assets/textures/Character Textures/Character_Rüstung_Normal.png
--- a/assets/game_assets/textures/Character Textures/Character_Rüstung_Roughness.png
+++ b/assets/game_assets/textures/Character Textures/Character_Rüstung_Roughness.png
--- a/assets/game_assets/textures/Character Textures/Character_Sword_BaseColor.png
+++ b/assets/game_assets/textures/Character Textures/Character_Sword_BaseColor.png
--- a/assets/game_assets/textures/Character Textures/Character_Sword_Height.png
+++ b/assets/game_assets/textures/Character Textures/Character_Sword_Height.png
--- a/assets/game_assets/textures/Character Textures/Character_Sword_Metallic.png
+++ b/assets/game_assets/textures/Character Textures/Character_Sword_Metallic.png
--- a/assets/game_assets/textures/Character Textures/Character_Sword_Normal.png
+++ b/assets/game_assets/textures/Character Textures/Character_Sword_Normal.png
--- a/assets/game_assets/textures/Character Textures/Character_Sword_Roughness.png
+++ b/assets/game_assets/textures/Character Textures/Character_Sword_Roughness.png
--- a/assets_raw/Character.fbx
+++ b/assets_raw/Character.fbx
--- a/mirrage @ c63bd245
+++ b/mirrage @ c63bd245
-Subproject commit a75972722af8eef63c531085703c680d535e1a2d
+Subproject commit c63bd245acc2bc2245ae1a4a835e5d738b08d082