zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-01 09:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove specialt exture

Browse Source
This commit is contained in:
arthur.jamet
2021-06-04 13:14:10 +02:00
parent da972a36e8
commit 8324eb48c2
4 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/map/upper_floor.mtl
+4 -16
View File
@@ -1,24 +1,12 @@
# Blender MTL File: 'None'
# Material Count: 2
# Material Count: 1
newmtl Material.001
Ns 225.000000
newmtl upper_floor.png
Ns 323.999994
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
Ni 1.000000
d 1.000000
illum 2
map_Kd upper_floor.png
newmtl floor
Ns 225.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
map_Kd unbreakable_wall.png
assets/map/upper_floor.obj
+7 -8
View File
@@ -1,7 +1,7 @@
# Blender v2.92.0 OBJ File: ''
# www.blender.org
mtllib upper_floor.mtl
o floor
o floor.001_floor.002
v -0.500000 -0.500000 0.500000
v 0.500000 -0.500000 0.500000
v -0.500000 0.500000 0.500000
@@ -32,17 +32,17 @@ vt 0.828427 0.414214
vt 0.414214 0.000000
vt 0.414214 0.414214
vt 0.414214 0.828427
vt 0.000000 0.828427
vt 0.414214 0.414214
vt 0.000000 0.414214
vt 0.134181 0.701308
vt 0.548395 0.287095
vt 0.134181 0.287095
vn 0.0000 -0.0000 1.0000
vn 0.0000 0.0000 -1.0000
vn 0.0000 -1.0000 -0.0000
vn 1.0000 0.0000 0.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 1.0000 0.0000
usemtl floor
s 1
usemtl floor.002
s off
f 1/1/1 2/2/1 3/3/1
f 3/3/1 2/2/1 4/4/1
f 5/5/2 6/6/2 7/7/2
@@ -53,6 +53,5 @@ f 2/15/4 8/10/4 4/16/4
f 4/16/4 8/10/4 6/17/4
f 7/18/5 1/19/5 5/20/5
f 5/20/5 1/19/5 3/21/5
usemtl Material.001
f 3/22/6 4/23/6 5/24/6
f 5/24/6 4/23/6 6/25/6
f 5/24/6 4/23/6 6/25/6
sources/Map/Map.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ namespace BBM
scene->addEntity("Upper Floor")
.addComponent<PositionComponent>(Vector3f(coords))
//.addComponent<CollisionComponent>(1)
.addComponent<Drawable3DComponent<RAY3D::Model>>(floorObj);
.addComponent<Drawable3DComponent<RAY3D::Model>>(floorObj, std::make_pair(MAP_DIFFUSE, floorPng));
}
sources/Runner/Runner.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ namespace BBM
void enableRaylib(WAL::Wal &wal)
{
//RAY::TraceLog::setLevel(LOG_WARNING);
RAY::TraceLog::setLevel(LOG_WARNING);
RAY::Window &window = RAY::Window::getInstance(600, 400, "Bomberman", FLAG_WINDOW_RESIZABLE);
wal.addSystem<Renderer3DSystem<RAY3D::Model>>();