smol changes
This commit is contained in:
parent
b7973fbbda
commit
eb40a191bb
BIN
obj/entities.o
BIN
obj/entities.o
Binary file not shown.
BIN
obj/main.o
BIN
obj/main.o
Binary file not shown.
Binary file not shown.
After Width: | Height: | Size: 6.8 KiB |
Binary file not shown.
After Width: | Height: | Size: 2.5 KiB |
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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]
|
||||
|
||||
|
|
Loading…
Reference in New Issue