diff --git a/bin/back b/bin/back index 58c798f..55b2d5c 100755 Binary files a/bin/back and b/bin/back differ diff --git a/obj/entities.o b/obj/entities.o index 8ad8f8e..2c94e76 100644 Binary files a/obj/entities.o and b/obj/entities.o differ diff --git a/obj/main.o b/obj/main.o index 1ce9940..ecfe359 100644 Binary files a/obj/main.o and b/obj/main.o differ diff --git a/res/brick.jpeg b/res/brick.jpeg new file mode 100644 index 0000000..9e2747f Binary files /dev/null and b/res/brick.jpeg differ diff --git a/res/brick.png b/res/brick.png new file mode 100644 index 0000000..02a5481 Binary files /dev/null and b/res/brick.png differ diff --git a/src/entities.c b/src/entities.c index d74f130..17a279b 100644 --- a/src/entities.c +++ b/src/entities.c @@ -202,18 +202,24 @@ void translatePlayer(float dtime, int* hp, int* dmg, entity* ent, cube_0* ret) { double dx = ent->metad4*(cos((double)(ent->metai1*(sim_time+(double)dtime)/ent->metai2 + ent->metai3*3.14159/180.0))-cos((double)(ent->metai1*sim_time/ent->metai2 + ent->metai3*3.14159/180.0))); double dy = ent->metad5*(cos((double)(ent->metai1*(sim_time+(double)dtime)/ent->metai2 + ent->metai3*3.14159/180.0))-cos((double)(ent->metai1*sim_time/ent->metai2 + ent->metai3*3.14159/180.0))); double dz = ent->metad6*(cos((double)(ent->metai1*(sim_time+(double)dtime)/ent->metai2 + ent->metai3*3.14159/180.0))-cos((double)(ent->metai1*sim_time/ent->metai2 + ent->metai3*3.14159/180.0))); - fx += dx/(dtime*dtime); - fy += dy/(dtime*dtime); - fz += dz/(dtime*dtime); + //fx += dx/(dtime*dtime); + //fy += dy/(dtime*dtime); + //fz += dz/(dtime*dtime); + camvx += dx/(dtime); + camvy += dy/(dtime); + camvz += dz/(dtime); } void translatePlayerLine(float dtime, int* hp, int* dmg, entity* ent, cube_0* ret) { double dx = (ent->metai1)*ent->metad4*dtime; double dy = (ent->metai2)*ent->metad5*dtime; double dz = (ent->metai3)*ent->metad6*dtime; - fx += dx/(dtime*dtime); - fy += dy/(dtime*dtime); - fz += dz/(dtime*dtime); + //fx += dx/(dtime*dtime); + //fy += dy/(dtime*dtime); + //fz += dz/(dtime*dtime); + camvx += dx/(dtime); + camvy += dy/(dtime); + camvz += dz/(dtime); } void go_to_player(double x, double y, double z, double w, double h, double d, double hz_angle, double vt_angle, float dtime, entity* ent, cube_0* ret) { diff --git a/src/main.c b/src/main.c index 91e3bb6..50abdf8 100644 --- a/src/main.c +++ b/src/main.c @@ -443,6 +443,7 @@ int main_alt() { generate_texture(3, "res/money.png", PNG); generate_texture(4, "res/container.jpg", JPG); generate_texture(5, "res/steel.jpeg", JPEG); + //generate_texture(5, "res/brick.png", JPEG); generate_texture(6, "res/gateway.jpeg", JPEG); generate_texture(7, "res/lock.png", PNG); generate_texture(8, "res/beat_on.png", JPG); diff --git a/templates/room_6 b/templates/room_6 index 028a900..b71a612 100644 --- a/templates/room_6 +++ b/templates/room_6 @@ -9,7 +9,7 @@ Teleporters : Entities: [-2.0, 4.1, -2.0, 4.0, 1.0, 4.0, 0.0, 0.0, 32, 128, 192, 10, 0, 5, 0.0, 4.0, 0.0, 0.0, 5.5, 0.0] -[-6.0, 8.1, -2.0, 4.0, 1.0, 4.0, 0.0, 0.0, 32, 128, 192, 10, 0, 5, 0.0, 4.0, 0.0, 0.0, 6.0, 0.0] +[-6.0, 8.1, -2.0, 4.0, 1.0, 4.0, 0.0, 0.0, 32, 128, 192, 10, 0, 10, 2.0, 0.0] [6.0, 12.1, -2.0, 4.0, 1.0, 4.0, 0.0, 0.0, 32, 128, 192, 10, 0, 5, 0.0, 4.0, 0.0, 0.0, 6.5, 0.0] [0.0, 20.0, 0.0, 0.5, 0.5, 0.5, 0.0, 0.0, 255, 255, 0, 10, 0, 0]