mp2i-vms.fr
fixed physics on spinning platforms + added level 3
This commit is contained in:
parent
a075564477
commit
89b1637d46
|
|
@ -40,7 +40,7 @@ entities:
|
|||
|
||||
-> 0 (coin) -> damage equals the coin's value
|
||||
-> 1 (non-moving explosive)
|
||||
-> 2 (damaging firebar)
|
||||
-> 2 (damaging firebar/spinning platform (set damage to 0))
|
||||
[.. hz_rps, vt_rps, x_offset, y_offset, z_offset, dps] with
|
||||
{hz,vt}_rps = double
|
||||
hz0, vt_0 = double
|
||||
|
|
|
|||
|
|
@ -30,12 +30,13 @@ Blocks :
|
|||
[7.0, 44.0, 2.0, 4.0, 1.0, 4.0, 0.0, 0.0, 32, 192, 32] // cp4
|
||||
|
||||
Entities:
|
||||
[-15.0, 4.0, -15.0, 4.0, 1.0, 5.0, 0.0, 0.0, 255, 255, 255, 1, 0, 2, 0.0, 42.0, 0.0, 0.0, 2.0, 1]
|
||||
[-15.0, 4.0, -10.0, 4.0, 1.0, 5.0, 0.0, 0.0, 255, 255, 255, 1, 0, 2, 0.0, 42.0, 0.0, 0.0, 2.0, 1]
|
||||
[-10.0, 4.0, -20.0, 5.0, 1.0, 5.0, 0.0, 0.0, 255, 255, 255, 1, 0, 2, 3.0, 0.0, 0.0, 0.0, 0.0, 0]
|
||||
|
||||
|
||||
[8.0, 1.0 , 8.0, 2.0, 2.0, 2.0, 0.0, 0.0, 255, 255, 128, 1, 0, 8, 100, 1, 128, 128, 128]
|
||||
[-8.0, 1.0, 8.0, 2.0, 2.0, 2.0, 0.0, 0.0, 255, 255, 255, 1, 0, 6, get over it, 192, 192, 192]
|
||||
[8.5, 1.5 , 8.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 1, 0, 7, levels/level_01/, 7, great, 192, 192, 192]
|
||||
[8.5, 1.5 , 8.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 1, 0, 7, levels/level_03/, 1, excellent, 192, 192, 192]
|
||||
|
||||
[-3.5, 13.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 128, 10, 0, 0] // cp1 coin
|
||||
[-3.5, 23.0, -15.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 128, 20, 0, 0] // cp2 coin
|
||||
|
|
|
|||
|
|
@ -0,0 +1,143 @@
|
|||
Blocks:
|
||||
[-16.0, -1.0, -16.0, 32.0, 1.0, 32.0, 0.0, 0.0, 255, 255, 255] // yeet level
|
||||
[-0.5, 0.0, -0.5, 1.0, 0.5, 1.0, 0.0, 0.0, 255, 255, 0]
|
||||
|
||||
[-7.0, 5.0, -7.0, 14.0, 1.0, 1.5, 0.0, 0.0, 128, 128, 128]
|
||||
[-7.0, 5.0, 5.5, 14.0, 1.0, 1.5, 0.0, 0.0, 128, 128, 128]
|
||||
[-7.0, 5.0, -7.0, 1.5, 1.0, 14.0, 0.0, 0.0, 128, 128, 128]
|
||||
[ 5.5, 5.0, -7.0, 1.5, 1.0, 14.0, 0.0, 0.0, 128, 128, 128]
|
||||
|
||||
[-3.0, 3.334, -8.5, 6.0, 1.0, 1.5, 0.0, 0.0, 128, 128, 128]
|
||||
[-3.0, 3.334, 7.0, 6.0, 1.0, 1.5, 0.0, 0.0, 128, 128, 128]
|
||||
[-8.5, 3.334, -3.0, 1.5, 1.0, 6.0, 0.0, 0.0, 128, 128, 128]
|
||||
[ 7.0, 3.334, -3.0, 1.5, 1.0, 6.0, 0.0, 0.0, 128, 128, 128]
|
||||
|
||||
[-7.0, 1.667, -8.5, 14.0, 1.0, 1.5, 0.0, 0.0, 128, 128, 128]
|
||||
[-7.0, 1.667, 7.0, 14.0, 1.0, 1.5, 0.0, 0.0, 128, 128, 128]
|
||||
[-8.5, 1.667, -7.0, 1.5, 1.0, 14.0, 0.0, 0.0, 128, 128, 128]
|
||||
[ 7.0, 1.667, -7.0, 1.5, 1.0, 14.0, 0.0, 0.0, 128, 128, 128]
|
||||
|
||||
Entities:
|
||||
|
||||
[-4.0, 4.0, -0.5, 4.0, 1.0, 5.0, 0.0, 0.0, 255, 255, 255, 1, 0, 2, 0.0, 30.0, 0.0, 0.0, 2.0, 1]
|
||||
[-16.0, 0.0, -16.0, 2.0, 2.0, 2.0, 0.0, 0.0, 255, 255, 192, 1, 0, 6, yeet, 255, 255, 255]
|
||||
|
||||
[12.0, 0.0, 12.0, 4.0, 4.0, 4.0, 0.0, 0.0, 255, 255, 255, 1, 0, 8, 200, 1, 64, 64, 64]
|
||||
[13.0, 1.0, 13.0, 2.0, 2.0, 2.0, 0.0, 0.0, 255, 255, 255, 1, 0, 7, levels/level_03/, 1, keep going, 192, 192, 192]
|
||||
|
||||
[-2.5, 30.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0] // I should introduce for loops in these
|
||||
[-1.5, 30.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-0.5, 30.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 0.5, 30.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 1.5, 30.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 2.5, 30.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-2.5, 30.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-1.5, 30.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-0.5, 30.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 0.5, 30.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 1.5, 30.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 2.5, 30.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-2.5, 30.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-1.5, 30.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-0.5, 30.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 0.5, 30.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 1.5, 30.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 2.5, 30.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-2.5, 30.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-1.5, 30.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-0.5, 30.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 0.5, 30.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 1.5, 30.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 2.5, 30.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-2.5, 30.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-1.5, 30.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-0.5, 30.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 0.5, 30.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 1.5, 30.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 2.5, 30.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-2.5, 30.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-1.5, 30.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[-0.5, 30.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 0.5, 30.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 1.5, 30.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
[ 2.5, 30.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 128, 128, 128, 1, 0, 0]
|
||||
|
||||
[-2.5, 50.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-1.5, 50.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-0.5, 50.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 0.5, 50.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 1.5, 50.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 2.5, 50.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-2.5, 50.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-1.5, 50.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-0.5, 50.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 0.5, 50.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 1.5, 50.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 2.5, 50.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-2.5, 50.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-1.5, 50.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-0.5, 50.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 0.5, 50.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 1.5, 50.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 2.5, 50.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-2.5, 50.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-1.5, 50.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-0.5, 50.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 0.5, 50.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 1.5, 50.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 2.5, 50.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-2.5, 50.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-1.5, 50.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-0.5, 50.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 0.5, 50.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 1.5, 50.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 2.5, 50.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-2.5, 50.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-1.5, 50.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[-0.5, 50.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 0.5, 50.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 1.5, 50.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
[ 2.5, 50.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 192, 192, 192, 2, 0, 0]
|
||||
|
||||
[-2.5, 70.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-1.5, 70.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-0.5, 70.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 0.5, 70.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 1.5, 70.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 2.5, 70.0, -2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-2.5, 70.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-1.5, 70.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-0.5, 70.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 0.5, 70.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 1.5, 70.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 2.5, 70.0, -1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-2.5, 70.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-1.5, 70.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-0.5, 70.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 0.5, 70.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 1.5, 70.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 2.5, 70.0, -0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-2.5, 70.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-1.5, 70.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-0.5, 70.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 0.5, 70.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 1.5, 70.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 2.5, 70.0, 0.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-2.5, 70.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-1.5, 70.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-0.5, 70.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 0.5, 70.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 1.5, 70.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 2.5, 70.0, 1.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-2.5, 70.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-1.5, 70.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[-0.5, 70.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 0.5, 70.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 1.5, 70.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
[ 2.5, 70.0, 2.5, 1.0, 1.0, 1.0, 0.0, 0.0, 255, 255, 255, 3, 0, 0]
|
||||
|
||||
|
||||
Weight:
|
||||
0
|
||||
|
||||
$
|
||||
BIN
obj/main.o
BIN
obj/main.o
Binary file not shown.
BIN
obj/move.o
BIN
obj/move.o
Binary file not shown.
|
|
@ -299,7 +299,7 @@ void processInput(GLFWwindow *window, float dtime) {
|
|||
hardReset = false;
|
||||
//reset_everything(window, 4, "levels/level_00/");
|
||||
//reset_everything(window, 7, "levels/level_01/");
|
||||
reset_everything(window, 1, "levels/level_02/");
|
||||
reset_everything(window, 1, "levels/level_03/");
|
||||
}
|
||||
} else {
|
||||
rPress = false;
|
||||
|
|
|
|||
17
src/move.c
17
src/move.c
|
|
@ -280,25 +280,32 @@ void updateF(cube_0* cb, double dtime, entity* ent) {
|
|||
normalize(&u);
|
||||
|
||||
if(ent != NULL && ent->entity_type == 2) {
|
||||
double radspeed = distance_pt_pt_3d(camx, camy, camz, ent->metad4, ent->metad5, ent->metad6)*(ent->metad1+ent->metad2);
|
||||
double radspeed = distance_pt_pt_3d(camx, camy, camz, ent->metad4+ent->pos->w/2.0, camy, ent->metad6+ent->pos->d/2.0
|
||||
)*(ent->metad1);
|
||||
double radspeed2 = distance_pt_pt_3d(camx, camy, camz, camx, ent->metad5+ent->pos->h/2.0, ent->metad6+ent->pos->d/2.0
|
||||
)*(ent->metad2);
|
||||
|
||||
pt_2d camD;
|
||||
camD.x = camx - ent->pos->w/2.0 - ent->metad4;
|
||||
camD.y = 0.0;
|
||||
camD.z = camz - ent->pos->d/2.0 - ent->metad6;
|
||||
if(camD.x*camD.x + camD.y*camD.y + camD.z*camD.z != 0.0) { // avoid division by 0.0
|
||||
normalize(&camD);
|
||||
}
|
||||
pt_2d utheta = cross_product(camD, normal);
|
||||
|
||||
pt_2d camD2;
|
||||
camD2.x = 0.0;
|
||||
camD2.y = camy - ent->pos->h/2.0 - ent->metad5;
|
||||
camD2.z = camz - ent->pos->d/2.0 - ent->metad6;
|
||||
if(camD2.x*camD2.x + camD2.y*camD2.y + camD2.z*camD2.z != 0.0) { // avoid division by 0.0
|
||||
normalize(&camD2);
|
||||
pt_2d utheta2 = cross_product(camD2, normal);
|
||||
}
|
||||
pt_2d utheta2 = normal;//cross_product(camD2, normal);
|
||||
|
||||
camvx = u.x*normv*(blockRestitution) + utheta.x*radspeed - utheta2.x*radspeed;
|
||||
camvy = u.y*normv*(blockRestitution) + utheta.y*radspeed - utheta2.y*radspeed;
|
||||
camvz = u.z*normv*(blockRestitution) + utheta.z*radspeed - utheta2.z*radspeed;
|
||||
camvx = u.x*normv*(blockRestitution) + utheta.x*radspeed + utheta2.x*radspeed2;
|
||||
camvy = u.y*normv*(blockRestitution) + utheta.y*radspeed + utheta2.y*radspeed2;
|
||||
camvz = u.z*normv*(blockRestitution) + utheta.z*radspeed + utheta2.z*radspeed2;
|
||||
} else {
|
||||
camvx = u.x*normv*(blockRestitution);
|
||||
camvy = u.y*normv*(blockRestitution);
|
||||
|
|
|
|||
|
|
@ -26,28 +26,3 @@ Weight :
|
|||
50
|
||||
|
||||
$
|
||||
entities:
|
||||
[x, y, z, w, h, d, rhz, rvt, red, green, blue, hp, damage, entityType ..]
|
||||
|
||||
if entityType = 4 (moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, mult, divd, phase] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
{mult,divd} = int
|
||||
{phase} = int[0, 360]
|
||||
|
||||
else if entityType = 5 (linear moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, speed_x, speed_y, speed_z] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
speed_{x,y,z} = double
|
||||
|
||||
else if entityType = 6 (text box)
|
||||
[.. text] with
|
||||
text = {char*}
|
||||
|
||||
else if entityType = 7 (warp text box)
|
||||
[.. dest_folder, room_count, text, r, g, b] with
|
||||
{dest_folder,text} = {char*} (length <= 50)
|
||||
{r,g,b} = int[0-256]
|
||||
|
||||
else
|
||||
[..]
|
||||
|
|
@ -21,28 +21,3 @@ Weight :
|
|||
50
|
||||
|
||||
$
|
||||
entities:
|
||||
[x, y, z, w, h, d, rhz, rvt, red, green, blue, hp, damage, entityType ..]
|
||||
|
||||
if entityType = 4 (moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, mult, divd, phase] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
{mult,divd} = int
|
||||
{phase} = int[0, 360]
|
||||
|
||||
else if entityType = 5 (linear moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, speed_x, speed_y, speed_z] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
speed_{x,y,z} = double
|
||||
|
||||
else if entityType = 6 (text box)
|
||||
[.. text] with
|
||||
text = {char*}
|
||||
|
||||
else if entityType = 7 (warp text box)
|
||||
[.. dest_folder, room_count, text, r, g, b] with
|
||||
{dest_folder,text} = {char*} (length <= 50)
|
||||
{r,g,b} = int[0-256]
|
||||
|
||||
else
|
||||
[..]
|
||||
|
|
@ -17,28 +17,3 @@ Weight :
|
|||
50
|
||||
|
||||
$
|
||||
entities:
|
||||
[x, y, z, w, h, d, rhz, rvt, red, green, blue, hp, damage, entityType ..]
|
||||
|
||||
if entityType = 4 (moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, mult, divd, phase] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
{mult,divd} = int
|
||||
{phase} = int[0, 360]
|
||||
|
||||
else if entityType = 5 (linear moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, speed_x, speed_y, speed_z] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
speed_{x,y,z} = double
|
||||
|
||||
else if entityType = 6 (text box)
|
||||
[.. text] with
|
||||
text = {char*}
|
||||
|
||||
else if entityType = 7 (warp text box)
|
||||
[.. dest_folder, room_count, text, r, g, b] with
|
||||
{dest_folder,text} = {char*} (length <= 50)
|
||||
{r,g,b} = int[0-256]
|
||||
|
||||
else
|
||||
[..]
|
||||
|
|
@ -16,28 +16,3 @@ Weight :
|
|||
50
|
||||
|
||||
$
|
||||
entities:
|
||||
[x, y, z, w, h, d, rhz, rvt, red, green, blue, hp, damage, entityType ..]
|
||||
|
||||
if entityType = 4 (moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, mult, divd, phase] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
{mult,divd} = int
|
||||
{phase} = int[0, 360]
|
||||
|
||||
else if entityType = 5 (linear moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, speed_x, speed_y, speed_z] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
speed_{x,y,z} = double
|
||||
|
||||
else if entityType = 6 (text box)
|
||||
[.. text] with
|
||||
text = {char*}
|
||||
|
||||
else if entityType = 7 (warp text box)
|
||||
[.. dest_folder, room_count, text, r, g, b] with
|
||||
{dest_folder,text} = {char*} (length <= 50)
|
||||
{r,g,b} = int[0-256]
|
||||
|
||||
else
|
||||
[..]
|
||||
|
|
@ -17,28 +17,3 @@ Weight :
|
|||
50
|
||||
|
||||
$
|
||||
entities:
|
||||
[x, y, z, w, h, d, rhz, rvt, red, green, blue, hp, damage, entityType ..]
|
||||
|
||||
if entityType = 4 (moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, mult, divd, phase] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
{mult,divd} = int
|
||||
{phase} = int[0, 360]
|
||||
|
||||
else if entityType = 5 (linear moving platform)
|
||||
[.. amplitude_x, amplitude_y, amplitude_z, speed_x, speed_y, speed_z] with
|
||||
amplitude_{x,y,z} = double[>= 0.0]
|
||||
speed_{x,y,z} = double
|
||||
|
||||
else if entityType = 6 (text box)
|
||||
[.. text] with
|
||||
text = {char*}
|
||||
|
||||
else if entityType = 7 (warp text box)
|
||||
[.. dest_folder, room_count, text, r, g, b] with
|
||||
{dest_folder,text} = {char*} (length <= 50)
|
||||
{r,g,b} = int[0-256]
|
||||
|
||||
else
|
||||
[..]
|
||||
Loading…
Reference in New Issue