Skip to content
Snippets Groups Projects
Commit 6ba852a5 authored by Thomas's avatar Thomas
Browse files

#1 Fixed Centering of Pacman, Ghost and Pellets.

parent 1c930401
No related branches found
No related tags found
No related merge requests found
# Blender MTL File: 'untitled.blend' #
# Material Count: 3 #
#
newmtl Material.010 newmtl Sphere.005_Sphere.001_Sphere.005_Sphere.001_Material.014 Mesh_Material.014
Ns 225.000000 illum 2
Ka 1.000000 1.000000 1.000000 Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000 Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000 Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
newmtl Material.012
Ns 225.000000 Ns 225.000000
newmtl Sphere.006_Sphere.001_Sphere.006_Sphere.001_Material.012 Mesh_Material.012
illum 2
Ka 1.000000 1.000000 1.000000 Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000 Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000 Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
newmtl Material.014
Ns 225.000000 Ns 225.000000
newmtl Sphere.007_Sphere.001_Sphere.007_Sphere.001_Material.010 Mesh_Material.010
illum 2
Ka 1.000000 1.000000 1.000000 Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000 Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000 Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000 Ns 225.000000
Ni 1.450000
d 1.000000
illum 2
This diff is collapsed.
# Blender MTL File: 'untitled.blend' #
# Material Count: 2 #
#
newmtl Material.009
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
newmtl Material.010
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
This diff is collapsed.
# Blender MTL File: 'None' #
# Material Count: 1 #
#
newmtl Material.006
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
This diff is collapsed.
# Blender MTL File: 'None' #
# Material Count: 1 #
#
newmtl Material
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
d 1.000000
illum 2
# Blender v2.90.1 OBJ File: '' #
# www.blender.org #
#
mtllib wall.mtl mtllib wall.mtl
o Cube
#
# Cube_Cube_Material Mesh Mesh
#
g Cube_Cube_Material Mesh Mesh
#
# Cube_Cube_Material Mesh Mesh_Cube_Cube_Material Mesh_Material
#
usemtl Cube_Cube_Material Mesh Mesh_Cube_Cube_Material Mesh_Material
v 1.000000 1.000000 -1.000000 v 1.000000 1.000000 -1.000000
v 1.000000 -1.000000 -1.000000
v 1.000000 1.000000 1.000000
v 1.000000 -1.000000 1.000000
v -1.000000 1.000000 -1.000000 v -1.000000 1.000000 -1.000000
v -1.000000 -1.000000 -1.000000
v -1.000000 1.000000 1.000000 v -1.000000 1.000000 1.000000
v 1.000000 1.000000 1.000000
v 1.000000 -1.000000 1.000000
v -1.000000 -1.000000 1.000000 v -1.000000 -1.000000 1.000000
v -1.000000 -1.000000 -1.000000
v 1.000000 -1.000000 -1.000000
vn 0.000000 1.000000 0.000000
vn 0.000000 0.000000 1.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 -1.000000 0.000000
vn 1.000000 0.000000 0.000000
vn 0.000000 0.000000 -1.000000
vt 0.625000 0.500000 vt 0.625000 0.500000
vt 0.875000 0.500000 vt 0.875000 0.500000
vt 0.875000 0.750000 vt 0.875000 0.750000
...@@ -24,18 +44,9 @@ vt 0.375000 0.250000 ...@@ -24,18 +44,9 @@ vt 0.375000 0.250000
vt 0.125000 0.500000 vt 0.125000 0.500000
vt 0.375000 0.500000 vt 0.375000 0.500000
vt 0.125000 0.750000 vt 0.125000 0.750000
vn 0.0000 1.0000 0.0000 f 1/1/1 2/2/1 3/3/1 4/4/1
vn 0.0000 0.0000 1.0000 f 5/5/2 4/4/2 3/6/2 6/7/2
vn -1.0000 0.0000 0.0000 f 6/8/3 3/9/3 2/10/3 7/11/3
vn 0.0000 -1.0000 0.0000 f 7/12/4 8/13/4 5/5/4 6/14/4
vn 1.0000 0.0000 0.0000 f 8/13/5 1/1/5 4/4/5 5/5/5
vn 0.0000 0.0000 -1.0000 f 7/11/6 2/10/6 1/1/6 8/13/6
g Cube_Cube_Material
usemtl Material
s off
f 1/1/1 5/2/1 7/3/1 3/4/1
f 4/5/2 3/4/2 7/6/2 8/7/2
f 8/8/3 7/9/3 5/10/3 6/11/3
f 6/12/4 2/13/4 4/5/4 8/14/4
f 2/13/5 1/1/5 3/4/5 4/5/5
f 6/11/6 5/10/6 1/1/6 2/13/6
...@@ -96,17 +96,17 @@ Map::Map() { ...@@ -96,17 +96,17 @@ Map::Map() {
// Assign all positions per ID // Assign all positions per ID
for (int i = 0; i < ROWMAX; i++) { for (int i = 0; i < ROWMAX; i++) {
offsetY = 0; offsetY = 0;
offsetX += 1.f; offsetX += 0.f;
for (int j = 0; j < COLUMNMAX; j++) { for (int j = 0; j < COLUMNMAX; j++) {
int value = m_MapMatrix[i][j]; int value = m_MapMatrix[i][j];
offsetY += 1.f; offsetY += 0.f;
switch (value) { switch (value) {
case 1: // Wall case 1: // Wall
{ {
m_Walls.push_back(engine::m_SPtr<Wall>(i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z, 1.f, 1.f, 1.f)); m_Walls.push_back(engine::m_SPtr<Wall>(i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z, 0.5f, 0.5f, 0.5f));
break; break;
} }
case 2: // Player/Pacmand case 2: // Player/Pacman
{ {
m_Player = engine::m_SPtr<Pacman>(); m_Player = engine::m_SPtr<Pacman>();
m_Player->setPosition({ i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z }); m_Player->setPosition({ i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z });
...@@ -116,7 +116,7 @@ Map::Map() { ...@@ -116,7 +116,7 @@ Map::Map() {
break; break;
} }
case 0: // Pellets and Ghosts case 0: // Pellets and Ghosts
m_Pellets.push_back(engine::m_SPtr<Pellet>(i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z, 1.f, 1.f, 1.f)); m_Pellets.push_back(engine::m_SPtr<Pellet>(i + offsetX + cam.x, j + offsetY + cam.y, 0.f + cam.z, 0.1f, 0.1f, 0.1f));
// Ghost random position generation // Ghost random position generation
randomNumber = numDistribution(rando); randomNumber = numDistribution(rando);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment