Commit 1aa7d115 authored by Georg Schaefer's avatar Georg Schaefer
Browse files

Merge branch '17-models' into 'develop'

Resolve "Models"

Closes #17

See merge request !25
parents f9240ce8 c0b70eeb
Pipeline #3409 passed with stage
in 7 minutes and 14 seconds
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:ceiling"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:floor"
},
"Shadowcaster": {}
}
{
"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"
}
}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:wall_horizontal"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:wall_vertical"
},
"Shadowcaster": {}
}
dummy
tileset
##################
##----############
#| |---------##
......
......@@ -14,4 +14,4 @@ dummy
####| h h h h h - |#
####| h h h h |#
####|-------------------------|#
################################
\ No newline at end of file
################################
{
"substance_id": "default",
"albedo_aid": "ceiling_floor_albedo.ktx",
"normal_aid": "ceiling_floor_normal.ktx",
"brdf_aid": "ceiling_floor_brdf.ktx",
"emission_aid": ""
}
{
"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": ""
}
{
"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": ""
}
{
"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": ""
}
{
"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": ""
}
{
"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": ""
}
{
"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": ""
}
{
"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": ""
}
{
"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": ""
}
{
"substance_id": "default",
"albedo_aid": "floor_floor_albedo.ktx",
"normal_aid": "floor_floor_normal.ktx",
"brdf_aid": "floor_floor_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "idle_defaultmaterial_albedo.ktx",
"normal_aid": "idle_defaultmaterial_normal.ktx",
"brdf_aid": "idle_defaultmaterial_brdf.ktx",
"emission_aid": ""
}
{
"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"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment