Browse Source

Fix objective tilting random directions

master
Luna 7 years ago
parent
commit
e71debed39
4 changed files with 176 additions and 131 deletions
  1. BIN
      assets/maze.blend
  2. +166
    -124
      assets/maze.obj
  3. +6
    -6
      scenes/world.tscn
  4. +4
    -1
      scripts/player.gd

BIN
assets/maze.blend View File


+ 166
- 124
assets/maze.obj View File

@ -13,17 +13,17 @@ v -85.561905 -0.471266 -3.511225
v 1.000000 -1.000000 11.276722
v 0.999999 -0.471266 11.276723
v -85.561905 -0.471266 11.276721
v 0.999999 3.666377 11.276723
v 0.999999 3.666377 12.050567
v -85.561905 3.666377 12.050565
v -85.561905 3.666377 11.276721
v 0.999999 6.904276 11.276723
v 0.999999 6.904276 12.050567
v -85.561905 6.904276 12.050565
v -85.561905 6.904276 11.276721
v -85.561905 -0.471266 -2.700100
v 1.000000 -1.000000 -2.700100
v 1.000000 -0.471266 -2.700100
v 1.000000 3.846691 -3.511225
v -85.561905 3.846691 -3.511225
v -85.561905 3.846691 -2.700100
v 1.000000 3.846691 -2.700100
v 1.000000 7.084589 -3.511225
v -85.561905 7.084589 -3.511225
v -85.561905 7.084589 -2.700100
v 1.000000 7.084589 -2.700100
v 1.000000 -1.000000 6.761319
v 1.000000 -0.471266 7.413254
v -85.561905 -0.471266 7.413253
@ -35,24 +35,24 @@ v 1.000000 -0.471266 6.301361
v -85.561905 -0.471266 2.048380
v 1.000000 -1.000000 2.375701
v 1.000000 -0.471266 2.048381
v -36.923298 3.774218 2.048380
v -36.923298 3.774218 6.301360
v -36.923298 3.774218 1.045964
v -36.923298 3.774218 7.413254
v 1.000000 3.774218 6.301361
v 1.000000 3.774218 7.413254
v -85.561905 3.774218 2.048380
v -85.561905 3.774218 1.045964
v 1.000000 3.774218 1.045964
v 1.000000 3.774218 2.048381
v -36.923298 7.012117 2.048380
v -36.923298 7.012117 6.301360
v -36.923298 7.012117 1.045964
v -36.923298 7.012117 7.413254
v 1.000000 7.012117 6.301361
v 1.000000 7.012117 7.413254
v -85.561905 7.012117 2.048380
v -85.561905 7.012117 1.045964
v 1.000000 7.012117 1.045964
v 1.000000 7.012117 2.048381
v -14.047533 -1.000000 -3.511225
v -14.047533 -0.471266 -3.511225
v -14.047533 -0.471266 11.276722
v -14.047533 3.666377 12.050566
v -14.047533 3.666377 11.276722
v -14.047533 6.904276 12.050566
v -14.047533 6.904276 11.276722
v -14.047533 -0.471266 -2.700100
v -14.047533 3.846691 -3.511225
v -14.047533 3.846691 -2.700100
v -14.047533 7.084589 -3.511225
v -14.047533 7.084589 -2.700100
v -14.047533 -0.471266 7.413254
v -14.047533 -0.471266 1.045964
v -14.047533 -0.471266 6.301360
@ -61,121 +61,121 @@ v -36.923298 -0.471266 2.048380
v -36.923298 -0.471266 6.301360
v -36.923298 -0.471266 1.045964
v -36.923298 -0.471266 7.413254
v -14.047533 3.774218 7.413254
v -14.047533 3.774218 1.045964
v -14.047533 3.774218 6.301360
v -14.047533 3.774218 2.048380
v -14.047533 7.012117 7.413254
v -14.047533 7.012117 1.045964
v -14.047533 7.012117 6.301360
v -14.047533 7.012117 2.048380
v -19.786369 -1.000000 -3.511225
v -19.786369 -0.471266 -3.511225
v -19.786369 3.666377 12.050566
v -19.786369 3.846691 -3.511225
v -19.786369 6.904276 12.050566
v -19.786369 7.084589 -3.511225
v -19.786369 -0.471266 11.276722
v -19.786369 3.666377 11.276722
v -19.786369 6.904276 11.276722
v -19.786369 -0.471266 -2.700100
v -19.786369 3.846691 -2.700100
v -19.786369 7.084589 -2.700100
v -19.786369 -0.471266 7.413254
v -19.786369 -0.471266 1.045964
v -19.786369 -0.471266 6.301360
v -19.786369 -0.471266 2.048380
v -36.923298 3.846691 -2.700100
v -36.923298 7.084589 -2.700100
v -36.923298 -0.471266 -2.700100
v -36.923298 3.666377 11.276722
v -36.923298 6.904276 11.276722
v -36.923298 -0.471266 11.276722
v -19.786369 3.774218 7.413254
v -19.786369 3.774218 1.045964
v -19.786369 3.774218 6.301360
v -19.786369 3.774218 2.048380
v -19.786369 7.012117 7.413254
v -19.786369 7.012117 1.045964
v -19.786369 7.012117 6.301360
v -19.786369 7.012117 2.048380
v -25.763170 -1.000000 -3.511226
v -25.763170 -0.471266 -3.511225
v -25.763170 3.666377 12.050566
v -25.763170 3.846691 -3.511225
v -25.763170 6.904276 12.050566
v -25.763170 7.084589 -3.511225
v -25.763170 -0.471266 11.276722
v -25.763170 3.666377 11.276722
v -25.763170 6.904276 11.276722
v -25.763170 -0.471266 -2.700100
v -25.763170 3.846691 -2.700100
v -25.763170 7.084589 -2.700100
v -25.763170 -0.471266 7.413254
v -21.075886 -0.471266 1.045964
v -25.763170 -0.471266 6.301360
v -21.075886 -0.471266 2.048380
v -25.763170 3.774218 7.413254
v -21.075886 3.774218 1.045964
v -25.763170 3.774218 6.301360
v -21.075886 3.774218 2.048380
v -25.763170 7.012117 7.413254
v -21.075886 7.012117 1.045964
v -25.763170 7.012117 6.301360
v -21.075886 7.012117 2.048380
v -30.165419 -1.000000 -3.511226
v -30.165419 -0.471266 -3.511225
v -30.165419 3.666377 12.050566
v -30.165419 3.846691 -3.511225
v -30.165419 6.904276 12.050566
v -30.165419 7.084589 -3.511225
v -30.165419 -0.471266 11.276722
v -30.165419 3.666377 11.276722
v -30.165419 6.904276 11.276722
v -30.165419 -0.471266 -2.700100
v -30.165419 3.846691 -2.700100
v -30.165419 7.084589 -2.700100
v -30.165419 -0.471266 7.413254
v -25.053110 -0.471266 1.045964
v -30.165419 -0.471266 6.301360
v -25.053110 -0.471266 2.048380
v -36.923298 3.846691 -3.511225
v -36.923298 3.666377 12.050566
v -30.165419 3.774218 7.413254
v -25.053110 3.774218 1.045964
v -30.165419 3.774218 6.301360
v -25.053110 3.774218 2.048380
v -36.923298 7.084589 -3.511225
v -36.923298 6.904276 12.050566
v -30.165419 7.012117 7.413254
v -25.053110 7.012117 1.045964
v -30.165419 7.012117 6.301360
v -25.053110 7.012117 2.048380
v -31.215120 -1.000000 -3.511226
v -31.215120 -0.471266 -3.511225
v -31.215120 3.666377 12.050566
v -31.215120 3.846691 -3.511225
v -31.215120 6.904276 12.050566
v -31.215120 7.084589 -3.511225
v -31.215120 -0.471266 11.276722
v -31.215120 3.666377 11.276722
v -31.215120 6.904276 11.276722
v -31.215120 -0.471266 -2.700100
v -31.215120 3.846691 -2.700100
v -31.215120 7.084589 -2.700100
v -31.215120 -0.471266 7.413254
v -31.215120 -0.471266 1.045964
v -31.215120 -0.471266 6.301360
v -31.215120 -0.471266 2.048380
v -36.923298 -0.471266 -3.511225
v -36.923298 -1.000000 -3.511226
v -31.215120 3.774218 7.413254
v -31.215120 3.774218 1.045964
v -31.215120 3.774218 6.301360
v -31.215120 3.774218 2.048380
v -31.215120 7.012117 7.413254
v -31.215120 7.012117 1.045964
v -31.215120 7.012117 6.301360
v -31.215120 7.012117 2.048380
v -44.335945 -1.000000 -3.511226
v -60.451035 -0.471266 -3.511225
v -39.251568 -0.471266 12.050566
v -39.251568 3.666377 12.050566
v -60.451035 3.846691 -3.511225
v -60.422035 3.774218 2.048380
v -50.303310 3.774218 6.301360
v -60.422035 3.774218 1.045964
v -50.303310 3.774218 7.413254
v -39.251568 6.904276 12.050566
v -60.451035 7.084589 -3.511225
v -60.422035 7.012117 2.048380
v -50.303310 7.012117 6.301360
v -60.422035 7.012117 1.045964
v -50.303310 7.012117 7.413254
v -60.422035 -0.471266 2.048380
v -50.303310 -0.471266 6.301360
v -60.422035 -0.471266 1.045964
v -50.303310 -0.471266 7.413254
v -60.451035 3.846691 -2.700100
v -60.451035 7.084589 -2.700100
v -60.451035 -0.471266 -2.700100
v -39.251568 3.666377 11.276722
v -39.251568 6.904276 11.276722
v -39.251568 -0.471266 11.276722
v -48.600723 -1.000000 -3.511226
v -64.715813 -0.471266 -3.511225
v -43.516346 -0.471266 12.050566
v -43.516346 3.666377 12.050566
v -64.715813 3.846691 -3.511225
v -64.686813 3.774218 2.048380
v -64.686813 3.774218 1.045964
v -43.516346 6.904276 12.050566
v -64.715813 7.084589 -3.511225
v -64.686813 7.012117 2.048380
v -64.686813 7.012117 1.045964
v -64.686813 -0.471266 2.048380
v -64.686813 -0.471266 1.045964
v -85.567291 -0.471266 6.301360
v -64.715813 3.846691 -2.700100
v -64.715813 7.084589 -2.700100
v -64.715813 -0.471266 -2.700100
v -43.516346 3.666377 11.276722
v -43.516346 6.904276 11.276722
v -43.516346 -0.471266 11.276722
v -85.684341 3.774218 6.301360
v -85.684341 3.774218 7.413254
v -85.684341 7.012117 6.301360
v -85.684341 7.012117 7.413254
v -85.684341 -0.471266 6.301360
v -85.684341 -0.471266 7.413254
v -55.445480 -0.471266 7.413254
v -55.445480 -0.471266 6.301360
v -55.445480 3.774218 7.413254
v -55.445480 3.774218 6.301360
v -55.445480 7.012117 7.413254
v -55.445480 7.012117 6.301360
v -101.792282 -1.000000 -3.511226
v -101.792282 -1.000000 12.050565
v -101.792282 -0.471266 12.050565
@ -184,50 +184,87 @@ v -85.561905 -1.000000 12.985348
v -85.561905 -0.471266 12.985348
v -101.792282 -1.000000 12.985348
v -101.792282 -0.471266 12.985348
v -102.458687 -1.000000 12.050565
v -85.516029 -5.981929 9.771648
v -102.458687 -0.471266 12.050565
v -102.458687 -1.000000 -3.511226
v -85.516029 -6.950646 8.591263
v -102.458687 -0.471266 -3.511225
v -85.561905 -1.000000 -4.127493
v -85.561905 -0.471266 -4.127493
v -101.792282 -0.471266 -4.127493
v -101.792282 -1.000000 -4.127493
v -85.561905 13.321682 -3.511225
v -101.792282 10.241516 -3.511225
v -101.792282 10.327558 -3.511225
v -85.561905 13.321683 -4.127492
v -101.792282 10.241517 -4.127492
v -101.792282 9.818419 12.050565
v -101.792282 10.220222 -3.511225
v -101.792282 9.915001 12.050565
v -101.792282 10.334589 -3.511225
v -102.458687 10.044893 12.050565
v -102.458687 10.044893 -3.511225
v -85.561905 13.773964 12.985348
v -101.792282 9.826112 12.985348
v -85.561905 13.773964 12.050565
v -101.792282 9.826112 12.050565
v -85.740379 14.142629 -3.512197
v -101.792282 9.913279 12.050565
v -101.970757 11.062463 -3.512197
v -101.970757 10.639365 12.049592
v -101.970757 11.041168 -3.512198
v -85.740379 14.594911 12.049592
v -101.970757 10.647058 12.049592
v -85.516029 -7.670466 1.282800
v -85.516029 -0.473968 -3.525748
v -85.516029 -3.454856 -2.932810
v -85.516029 -4.801546 -2.212987
v -85.516029 -6.950646 -0.063891
v -85.516029 -8.113729 2.744042
v -85.516029 -7.670466 7.244571
v -85.516029 -8.113729 5.783333
v -85.516029 -1.993612 -3.376074
v -85.516029 -5.981929 -1.244273
v -101.759323 -8.113729 2.744042
v -101.759323 -7.670466 1.282800
v -101.759323 -6.950646 -0.063891
v -101.759323 -5.981929 -1.244273
v -101.759323 -4.801546 -2.212987
v -101.759323 -3.454856 -2.932810
v -101.759323 -1.993612 -3.376074
v -101.759323 -0.473968 -3.525748
v -101.759323 -8.263401 4.263685
v -101.759323 -8.113729 5.783333
v -101.759323 -7.670466 7.244571
v -101.759323 -6.950646 8.591263
v -101.759323 -5.981929 9.771648
v -101.759323 -4.801546 10.740360
v -101.759323 -3.454856 11.460184
v -101.759323 -1.993612 11.903444
v -101.759323 -0.473968 12.053116
v -85.516029 -8.263401 4.263685
v -85.516029 -0.473968 12.053116
v -85.516029 -1.993612 11.903444
v -85.516029 -3.454856 11.460184
v -85.516029 -4.801546 10.740360
vn 0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 1.0000 0.0000
vn -0.0000 0.0000 1.0000
vn 0.0000 0.9569 0.2903
vn 0.0000 -0.9996 -0.0279
vn -0.1865 0.9825 0.0000
vn 0.0383 0.9992 0.0129
vn -0.2363 0.9717 0.0000
vn 0.0003 -0.0011 -1.0000
vn 0.2124 -0.9772 0.0012
vn -0.9772 -0.2124 0.0062
vn -0.0002 0.0011 1.0000
vn 0.0055 0.0000 -1.0000
vn -0.0055 -0.0000 1.0000
vn 0.9772 0.2124 0.0055
vn -0.2124 0.9772 -0.0012
vn 0.0000 0.4714 0.8819
vn 0.0000 0.9569 -0.2903
vn 0.0000 0.8819 -0.4714
vn 0.0000 0.8819 0.4714
vn 0.0000 0.9952 0.0980
vn -0.2336 0.9713 0.0453
vn 0.2030 -0.9792 0.0006
vn -0.0057 -0.0001 1.0000
vn 0.0000 0.6344 0.7730
vn 0.0000 0.2903 -0.9569
vn 0.0000 0.0980 0.9952
vn 0.0000 0.2903 0.9569
vn 0.0000 0.6344 -0.7730
vn 0.0000 0.9952 -0.0980
vn 0.0000 0.7730 -0.6344
vn 0.0000 0.0980 -0.9952
vn 0.0000 0.7730 0.6344
vn 0.0000 0.4714 -0.8819
usemtl Material
s off
f 166//1 11//1 15//1 165//1
@ -247,7 +284,7 @@ f 17//2 18//2 28//2 27//2
f 164//5 16//5 26//5 161//5
f 32//2 33//2 30//2 29//2
f 27//2 28//2 33//2 32//2
f 178//1 175//1 185//1 186//1
f 217//7 216//7 211//7 206//7
f 33//2 28//2 42//2 43//2
f 122//1 79//1 78//1 123//1
f 119//1 118//1 131//1 130//1
@ -274,7 +311,6 @@ f 12//5 48//5 47//5 13//5
f 24//5 52//5 46//5 10//5
f 5//1 1//1 44//1 45//1
f 10//1 46//1 48//1 12//1
f 136//3 131//3 118//3 100//3 84//3 64//3 44//3 1//3 17//3 27//3 32//3 29//3 23//3 9//3 2//3 3//3 176//3 175//3 4//3 153//3
f 90//6 70//6 71//6 91//6
f 119//1 130//1 112//1 121//1
f 95//6 75//6 83//6 99//6
@ -347,9 +383,9 @@ f 105//5 123//5 120//5 102//5
f 108//5 126//5 122//5 104//5
f 101//1 100//1 118//1 119//1
f 104//1 122//1 123//1 105//1
f 108//4 104//4 105//4 114//4
f 126//2 132//2 123//2 122//2
f 123//7 132//7 114//7 105//7
f 108//2 114//2 105//2 104//2
f 126//4 122//4 123//4 132//4
f 123//8 132//8 114//8 105//8
f 150//4 149//4 140//4 137//4
f 146//3 148//3 171//3 172//3
f 58//1 147//1 143//1 36//1
@ -378,7 +414,6 @@ f 172//3 171//3 170//3 169//3
f 11//4 7//4 14//4 15//4
f 173//5 174//5 167//5 168//5
f 170//4 168//4 167//4 169//4
f 25//5 148//5 146//5 57//5 56//5 145//5 160//5 31//5 26//5 16//5 8//5 178//5 177//5 7//5 11//5
f 3//2 7//2 180//2 179//2
f 165//5 15//5 14//5 156//5
f 155//2 166//2 165//2 156//2
@ -387,37 +422,44 @@ f 138//5 152//5 166//5 155//5
f 171//6 173//6 168//6 170//6
f 25//5 11//5 166//5 152//5 79//5 59//5
f 7//1 177//1 202//1 201//1
f 4//3 175//3 190//3 187//3
f 221//9 220//9 209//9 208//9
f 179//6 180//6 182//6 181//6
f 176//3 3//3 179//3 181//3
f 225//10 226//10 212//10 213//10
f 172//2 174//2 173//2 171//2
f 144//2 148//2 146//2 142//2
f 184//4 186//4 185//4 183//4
f 148//4 144//4 142//4 146//4
f 226//11 227//11 185//11 212//11
f 184//6 177//6 195//6 197//6
f 175//3 176//3 183//3 185//3
f 176//6 177//6 184//6 183//6
f 218//12 217//12 206//12 210//12
f 216//13 224//13 233//13 211//13
f 188//1 187//1 190//1 189//1
f 175//4 178//4 189//4 190//4
f 8//2 4//2 187//2 188//2
f 8//2 188//2 193//2 191//2
f 192//8 191//8 193//8 194//8
f 178//6 8//6 191//6 192//6
f 188//1 189//1 194//1 193//1
f 189//4 178//4 192//4 194//4
f 195//9 196//9 198//9 197//9
f 177//2 178//2 196//2 195//2
f 178//1 186//1 198//1 196//1
f 186//4 184//4 197//4 198//4
f 201//10 202//10 200//10 199//10
f 201//14 202//14 200//14 199//14
f 180//2 7//2 201//2 199//2
f 182//6 180//6 199//6 200//6
f 177//4 182//4 200//4 202//4
f 201//11 202//11 208//11 207//11
f 207//12 208//12 205//12 206//12 204//12 203//12
f 191//13 201//13 207//13 203//13
f 192//14 191//14 203//14 204//14
f 202//15 195//15 205//15 208//15
f 196//16 192//16 204//16 206//16
f 195//17 196//17 206//17 205//17
f 201//18 191//18 192//18 196//18 195//18 202//18
f 195//2 177//2 178//2 196//2
f 191//15 201//15 202//15 197//15 198//15 192//15
f 196//16 192//16 203//16 205//16
f 220//17 219//17 215//17 209//17
f 230//18 231//18 235//18 236//18
f 223//19 222//19 214//19 207//19
f 211//4 233//4 213//4 212//4 185//4 183//4 237//4 236//4 235//4 234//4 207//4 214//4 208//4 209//4 215//4 210//4 206//4
f 222//20 221//20 208//20 214//20
f 228//21 229//21 237//21 183//21
f 224//22 225//22 213//22 233//22
f 227//23 228//23 183//23 185//23
f 231//24 232//24 234//24 235//24
f 219//25 218//25 210//25 215//25
f 229//26 230//26 236//26 237//26
f 216//2 217//2 218//2 219//2 220//2 221//2 222//2 223//2 232//2 231//2 230//2 229//2 228//2 227//2 226//2 225//2 224//2
f 162//5 169//5 172//5 146//5 57//5 56//5 145//5 160//5 31//5
l 146 162
l 195 202
l 195 204

+ 6
- 6
scenes/world.tscn
File diff suppressed because it is too large
View File


+ 4
- 1
scripts/player.gd View File

@ -20,7 +20,7 @@ var walk_speed = 3
var jump_speed = 15
const air_accel = .5
var weight = 1
var weight = .1
var health = 100
var stamina = 10000
var ray_length = 10
@ -119,6 +119,9 @@ func control_player(delta):
for i in range(get_slide_count()):
var collision = get_slide_collision(i)
if collision.collider.is_in_group("objective"):
var rel_pos = collision.position - collision.collider.get_translation()
debug_node.set_text("%8.f,%8.f,%8.f" % [rel_pos.x, rel_pos.y, rel_pos.z])
collision.collider.apply_impulse(collision.position, Vector3(0, -weight, 0))
func _exit_scene():


Loading…
Cancel
Save