Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
*.cpp text eol=lf
*.hpp text eol=lf
*.hpp text eol=lf
*.jsonc text eol=lf
CmakeLists.txt text eol=lf
assets/shaders/** -filter -diff -merge text
assets filter=lfs diff=lfs merge=lfs -text
Binary file added assets/blends/map.blend
Binary file not shown.
Binary file added assets/gltf/map/map.glb
Binary file not shown.
56 changes: 32 additions & 24 deletions config/app.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@
}
},
"models": {
"drone": "assets/gltf/mech_drone/mech_drone.glb"
"drone": "assets/gltf/mech_drone/mech_drone.glb",
"map": "assets/gltf/map/map.glb",
"gun": "assets/gltf/weapons/rifle.glb"
}
},
"game": {
Expand Down Expand Up @@ -325,37 +327,43 @@
"layer": "player",
"radius": 0.45,
"height": 1.8
},
{
"type": "light",
"lightType": "spot",
"color": [1, 1, 1],
"attenuation": [1.0, 0.22, 0.2],
"spotAngles": [2, 5]
}
]
},
{
"name": "Ground",
"position": [0.0, 0.0, 0.0],
"rotation": [-90.0, 0.0, 0.0],
"scale": [120.0, 120.0, 1.0],
"components": [
],
"children": [
{
"type": "Mesh Renderer",
"mesh": "plane",
"material": "ground"
"position": [1, -1, -2],
"rotation": [0, 0, 0],
"scale": [0.3, 0.3, 0.3],
"components": [
{
"type": "Model Renderer",
"model": "gun"
}
],
"children": [
{
"position": [0, 0, 0],
"components": [
{
"type": "light",
"lightType": "spot",
"color": [1, 0.8, 0.6],
"attenuation": [1.0, 0.14, 0.07],
"spotAngles": [15, 20]
}
]
}
]
}
]
},
{
"position": [2, 1, -2],
"scale": [5, 5, 5],
"name": "map",
"position": [0, 0, 0],
"components": [
{
"type": "Mesh Renderer",
"mesh": "monkey",
"material": "monkey"
"type": "Model Renderer",
"model": "map"
}
]
}
Expand Down
Loading