juni/junisaber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
Diego F. Goberna
2018-12-05 21:51:52 +01:00
committed by Diego Marcos
parent 5ae970b04a
commit cba2bb9459
5 changed files with 150 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/img/atlas.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

80
assets/models/stageadditive.obj
View File

@@ -21,14 +21,14 @@ f 1/1 4/2 2/3
f 5/4 8/5 7/6
f 1/1 3/7 4/2
f 5/4 6/8 8/5
v 13.064644 5.472427 -33.581116
v 5.058533 13.523236 -33.581116
v 14.647807 7.055587 -33.454609
v 6.641695 15.106400 -33.454609
v -13.064644 5.472427 -33.581116
v -5.058533 13.523236 -33.581116
v -14.647807 7.055587 -33.454609
v -6.641695 15.106400 -33.454609
v 12.252777 5.572673 -32.471397
v 5.250416 12.614128 -32.471397
v 13.637454 6.957348 -32.360752
v 6.635092 13.998806 -32.360752
v -12.252777 5.572673 -32.471397
v -5.250416 12.614128 -32.471397
v -13.637454 6.957348 -32.360752
v -6.635092 13.998806 -32.360752
vt 0.900723 0.749152
vt 0.888596 0.500182
vt 0.888596 0.749152
@@ -63,14 +63,14 @@ f 17/17 20/18 18/19
f 21/20 24/21 23/22
f 17/17 19/23 20/18
f 21/20 22/24 24/21
v 13.042291 5.472427 -27.129221
v 5.058533 13.567941 -27.129221
v 14.625454 7.055587 -27.002712
v 6.641695 15.151104 -27.002712
v -13.042291 5.472427 -27.129221
v -5.058533 13.567941 -27.129221
v -14.625454 7.055587 -27.002712
v -6.641695 15.151104 -27.002712
v 12.313762 5.530656 -26.020502
v 5.205076 12.738849 -26.020502
v 13.723401 6.940291 -25.907860
v 6.614714 14.148487 -25.907860
v -12.313762 5.530656 -26.020502
v -5.205076 12.738849 -26.020502
v -13.723401 6.940291 -25.907860
v -6.614714 14.148487 -25.907860
vt 0.900723 0.749152
vt 0.888596 0.500182
vt 0.888596 0.749152
@@ -105,14 +105,14 @@ f 33/33 36/34 34/35
f 37/36 40/37 39/38
f 33/33 35/39 36/34
f 37/36 38/40 40/37
v 13.064644 5.472427 -20.677326
v 5.036180 13.523236 -20.677326
v 14.647807 7.055587 -20.550817
v 6.619342 15.106400 -20.550817
v -13.064644 5.472427 -20.677326
v -5.036180 13.523236 -20.677326
v -14.647807 7.055587 -20.550817
v -6.619342 15.106400 -20.550817
v 12.279459 5.500547 -19.531597
v 5.188914 12.610827 -19.531597
v 13.614179 6.835264 -19.424940
v 6.523632 13.945547 -19.424940
v -12.279459 5.500547 -19.531597
v -5.188914 12.610827 -19.531597
v -13.614179 6.835264 -19.424940
v -6.523632 13.945547 -19.424940
vt 0.900723 0.749152
vt 0.888596 0.500182
vt 0.888596 0.749152
@@ -126,14 +126,14 @@ f 43/41 42/42 41/43
f 46/44 47/45 45/46
f 43/41 44/47 42/42
f 46/44 48/48 47/45
v 15.178578 1.075909 -14.582047
v 1.075902 15.178576 -14.582046
v 19.149137 5.046469 -14.264764
v 5.046463 19.149136 -14.264764
v -15.178578 1.075909 -14.582047
v -1.075902 15.178576 -14.582046
v -19.149137 5.046469 -14.264764
v -5.046463 19.149136 -14.264764
v 15.152049 1.075909 -14.465206
v 1.049374 15.178576 -14.465204
v 19.122610 5.046469 -14.147923
v 5.019934 19.149136 -14.147923
v -15.152049 1.075909 -14.465206
v -1.049374 15.178576 -14.465204
v -19.122610 5.046469 -14.147923
v -5.019934 19.149136 -14.147923
vt 0.902059 0.748845
vt 0.937021 0.500380
vt 0.902059 0.500380
@@ -147,14 +147,14 @@ f 49/49 52/50 50/51
f 53/52 56/53 55/54
f 49/49 51/55 52/50
f 53/52 54/56 56/53
v 13.042291 5.472427 -14.225430
v 5.036181 13.545589 -14.225430
v 14.625454 7.055587 -14.098923
v 6.619343 15.128753 -14.098923
v -13.042291 5.472427 -14.225430
v -5.036181 13.545589 -14.225430
v -14.625454 7.055587 -14.098923
v -6.619343 15.128753 -14.098923
v 12.342604 5.472507 -13.154865
v 5.172476 12.702684 -13.154865
v 13.649470 6.779371 -13.050436
v 6.479342 14.009550 -13.050436
v -12.342604 5.472507 -13.154865
v -5.172476 12.702684 -13.154865
v -13.649470 6.779371 -13.050436
v -6.479342 14.009550 -13.050436
vt 0.900723 0.749152
vt 0.888596 0.500182
vt 0.888596 0.749152

208
assets/models/stagenormal.obj
View File

@@ -1147,39 +1147,39 @@ f 270/323 271/336 274/324
f 270/323 273/334 275/325
f 267/327 268/337 277/328
f 269/330 267/338 276/331
v 12.287717 7.337969 -32.869480
v 7.337968 12.287716 -32.869480
v 12.287717 7.337969 -33.090019
v 7.337968 12.287716 -33.090019
v 12.391678 7.441931 -32.869480
v 7.441930 12.391678 -32.869480
v -12.287717 7.337969 -32.869480
v -7.337968 12.287716 -32.869480
v -12.287717 7.337969 -33.090019
v -7.337968 12.287716 -33.090019
v -12.391678 7.441931 -32.869480
v -7.441930 12.391678 -32.869480
vt 0.761502 0.010903
vt 0.763618 0.009347
v 12.184137 7.523205 -32.839417
v 7.519168 12.188061 -32.839298
v 12.184223 7.523117 -33.012733
v 7.519087 12.188140 -33.012970
v 12.288087 7.615376 -32.839241
v 7.623117 12.279898 -32.839478
v -12.184137 7.523205 -32.839417
v -7.519168 12.188061 -32.839298
v -12.184223 7.523117 -33.012733
v -7.519087 12.188140 -33.012970
v -12.288087 7.615376 -32.839241
v -7.623117 12.279898 -32.839478
vt 0.763619 0.010903
vt 0.761502 0.009347
vt 0.763618 0.009347
vt 0.761503 0.012459
vt 0.763619 0.012459
vt 0.763618 0.009347
vt 0.761502 0.010903
vt 0.763619 0.010903
vt 0.761502 0.009347
vt 0.761502 0.010903
vt 0.761503 0.012459
vt 0.763619 0.012459
vt 0.761502 0.009347
vt 0.761502 0.009347
vt 0.761502 0.010903
vt 0.763618 0.009347
s off
f 280/339 281/340 279/341
f 284/342 279/341 283/343
f 287/344 286/345 285/346
f 285/346 290/347 289/348
f 280/339 282/349 281/340
f 284/342 280/339 279/341
f 287/344 288/350 286/345
f 285/346 286/345 290/347
f 279/339 282/340 281/341
f 284/342 279/339 283/343
f 285/344 288/345 286/346
f 285/344 290/347 289/348
f 279/339 280/349 282/340
f 284/342 280/349 279/339
f 285/344 287/350 288/345
f 285/344 286/346 290/347
v -19.994535 0.145583 -26.381851
v -20.733458 0.242623 -26.101696
v -19.994535 0.145583 -26.747669
@@ -1236,39 +1236,39 @@ f 294/362 295/375 298/363
f 294/362 297/373 299/364
f 291/366 292/376 301/367
f 293/369 291/377 300/370
v 12.287717 7.337969 -26.429806
v 7.337968 12.287716 -26.429806
v 12.287717 7.337969 -26.650343
v 7.337968 12.287716 -26.650343
v 12.391678 7.441931 -26.429806
v 7.441930 12.391678 -26.429806
v -12.287717 7.337969 -26.429806
v -7.337968 12.287716 -26.429806
v -12.287717 7.337969 -26.650343
v -7.337968 12.287716 -26.650343
v -12.391678 7.441931 -26.429806
v -7.441930 12.391678 -26.429806
vt 0.761502 0.010903
vt 0.763618 0.009347
v 12.185793 7.521502 -26.365339
v 7.517513 12.189671 -26.365223
v 12.185878 7.521415 -26.521633
v 7.517433 12.189749 -26.521868
v 12.289742 7.613811 -26.365168
v 7.621461 12.281650 -26.365400
v -12.185793 7.521502 -26.365339
v -7.517513 12.189671 -26.365223
v -12.185878 7.521415 -26.521633
v -7.517433 12.189749 -26.521868
v -12.289742 7.613811 -26.365168
v -7.621461 12.281650 -26.365400
vt 0.763619 0.010903
vt 0.761502 0.009347
vt 0.763618 0.009347
vt 0.761503 0.012459
vt 0.763619 0.012459
vt 0.763618 0.009347
vt 0.761502 0.010903
vt 0.763619 0.010903
vt 0.761502 0.009347
vt 0.761502 0.010903
vt 0.761503 0.012459
vt 0.763619 0.012459
vt 0.761502 0.009347
vt 0.761502 0.009347
vt 0.761502 0.010903
vt 0.763618 0.009347
s off
f 304/378 305/379 303/380
f 308/381 303/380 307/382
f 311/383 310/384 309/385
f 309/385 314/386 313/387
f 304/378 306/388 305/379
f 308/381 304/378 303/380
f 311/383 312/389 310/384
f 309/385 310/384 314/386
f 303/378 306/379 305/380
f 308/381 303/378 307/382
f 309/383 312/384 310/385
f 309/383 314/386 313/387
f 303/378 304/388 306/379
f 308/381 304/388 303/378
f 309/383 311/389 312/384
f 309/383 310/385 314/386
v -19.994535 0.145583 -19.922087
v -20.733458 0.242623 -19.641930
v -19.994535 0.145583 -20.287905
@@ -1325,39 +1325,39 @@ f 318/401 319/414 322/402
f 318/401 321/412 323/403
f 315/405 316/415 325/406
f 317/408 315/416 324/409
v 12.287717 7.337969 -19.990133
v 7.337968 12.287716 -19.990133
v 12.287717 7.337969 -20.210670
v 7.337968 12.287716 -20.210670
v 12.391678 7.441931 -19.990133
v 7.441930 12.391678 -19.990133
v -12.287717 7.337969 -19.990133
v -7.337968 12.287716 -19.990133
v -12.287717 7.337969 -20.210670
v -7.337968 12.287716 -20.210670
v -12.391678 7.441931 -19.990133
v -7.441930 12.391678 -19.990133
vt 0.761502 0.010903
vt 0.763618 0.009347
v 12.191691 7.527401 -19.925667
v 7.523411 12.195570 -19.925549
v 12.191776 7.527313 -20.081961
v 7.523331 12.195648 -20.082193
v 12.295641 7.619709 -19.925495
v 7.627360 12.287548 -19.925728
v -12.191691 7.527401 -19.925667
v -7.523411 12.195570 -19.925549
v -12.191776 7.527313 -20.081961
v -7.523331 12.195648 -20.082193
v -12.295641 7.619709 -19.925495
v -7.627360 12.287548 -19.925728
vt 0.763619 0.010903
vt 0.761502 0.009347
vt 0.763618 0.009347
vt 0.761503 0.012459
vt 0.763619 0.012459
vt 0.763618 0.009347
vt 0.761502 0.010903
vt 0.763619 0.010903
vt 0.761502 0.009347
vt 0.761502 0.010903
vt 0.761503 0.012459
vt 0.763619 0.012459
vt 0.761502 0.009347
vt 0.761502 0.009347
vt 0.761502 0.010903
vt 0.763618 0.009347
s off
f 328/417 329/418 327/419
f 332/420 327/419 331/421
f 335/422 334/423 333/424
f 333/424 338/425 337/426
f 328/417 330/427 329/418
f 332/420 328/417 327/419
f 335/422 336/428 334/423
f 333/424 334/423 338/425
f 327/417 330/418 329/419
f 332/420 327/417 331/421
f 333/422 336/423 334/424
f 333/422 338/425 337/426
f 327/417 328/427 330/418
f 332/420 328/427 327/417
f 333/422 335/428 336/423
f 333/422 334/424 338/425
v -19.994535 0.145583 -13.462321
v -20.733458 0.242623 -13.182165
v -19.994535 0.145583 -13.828139
@@ -1414,39 +1414,39 @@ f 342/440 343/453 346/441
f 342/440 345/451 347/442
f 339/444 340/454 349/445
f 341/447 339/455 348/448
v 12.287717 7.337969 -13.550458
v 7.337968 12.287716 -13.550458
v 12.287717 7.337969 -13.770994
v 7.337968 12.287716 -13.770994
v 12.391678 7.441931 -13.550458
v 7.441930 12.391678 -13.550458
v -12.287717 7.337969 -13.550458
v -7.337968 12.287716 -13.550458
v -12.287717 7.337969 -13.770994
v -7.337968 12.287716 -13.770994
v -12.391678 7.441931 -13.550458
v -7.441930 12.391678 -13.550458
vt 0.761502 0.010903
vt 0.763618 0.009347
v 12.163270 7.531362 -13.465248
v 7.514165 12.180348 -13.465123
v 12.163361 7.531269 -13.600848
v 7.514080 12.180431 -13.601098
v 12.267219 7.622876 -13.465064
v 7.618113 12.271510 -13.465314
v -12.163270 7.531362 -13.465248
v -7.514165 12.180348 -13.465123
v -12.163361 7.531269 -13.600848
v -7.514080 12.180431 -13.601098
v -12.267219 7.622876 -13.465064
v -7.618113 12.271510 -13.465314
vt 0.763619 0.010903
vt 0.761502 0.009347
vt 0.763618 0.009347
vt 0.761503 0.012459
vt 0.763619 0.012459
vt 0.763618 0.009347
vt 0.761502 0.010903
vt 0.763619 0.010903
vt 0.761502 0.009347
vt 0.761502 0.010903
vt 0.761503 0.012459
vt 0.763619 0.012459
vt 0.761502 0.009347
vt 0.761502 0.009347
vt 0.761502 0.010903
vt 0.763618 0.009347
s off
f 352/456 353/457 351/458
f 356/459 351/458 355/460
f 359/461 358/462 357/463
f 357/463 362/464 361/465
f 352/456 354/466 353/457
f 356/459 352/456 351/458
f 359/461 360/467 358/462
f 357/463 358/462 362/464
f 351/456 354/457 353/458
f 356/459 351/456 355/460
f 357/461 360/462 358/463
f 357/461 362/464 361/465
f 351/456 352/466 354/457
f 356/459 352/466 351/456
f 357/461 359/467 360/462
f 357/461 358/463 362/464
v 4.475000 0.625000 18.000004
v 4.475000 0.675000 18.000004
v 4.475000 0.625000 -81.999992

6
src/templates/gameMenu.html
View File

@@ -1,9 +1,9 @@
<a-mixin
id="gameMenuButton"
mixin="bigMenuButton"
animation__mouseenter="property: components.slice9.material.color; type: color; from: #050505; to: #067197; startEvents: mouseenter; pauseEvents: mouseleave; dur: 150"
animation__mouseleave="property: components.slice9.material.color; type: color; from: #067197; to: #050505; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150"
slice9="width: 1; height: 0.27; padding: 0.04"></a-mixin>
animation__mouseenter="property: components.slice9.material.color; type: color; from: #888; to: #fff; startEvents: mouseenter; pauseEvents: mouseleave; dur: 150"
animation__mouseleave="property: components.slice9.material.color; type: color; from: #fff; to: #888; startEvents: mouseleave; pauseEvents: mouseenter; dur: 150"
slice9="width: 1; height: 0.27;"></a-mixin>
<a-mixin
id="gameMenuButtonText"

6
src/templates/stage.html
View File

@@ -102,12 +102,12 @@
<a-mixin
id="smoke"
mixin="gameoverAnimation"
animation__gameover="property: components.material.material.opacity; to: 0; startEvents: gameover"
animation__gameover="property: components.material.material.opacity; to: 0; startEvents: gameoverDISABLE"
animation__rotate="property: rotation; to: 0 360 0; easing: linear; loop: true"
obj-model="obj:#smokeObj"
material="src: #atlasImg; fog: false; shader: flat; transparent: true; depthWrite: false"></a-mixin>
material="src: #atlasImg; shader: flat; transparent: true; depthWrite: false"></a-mixin>
<a-entity id="smoke1" mixin="smoke" position="0 1.4 0" animation__rotate="dur: 200000"></a-entity>
<a-entity id="smoke2" mixin="smoke" position="0 1.8 0" scale="1.09 0.8 1.09" animation__rotate="dur: 243000"></a-entity>
<!-- <a-entity id="smoke2" mixin="smoke" position="0 1.8 0" scale="1.09 0.8 1.09" animation__rotate="dur: 243000"></a-entity>-->
<a-entity light="type: directional; intensity: 3" position="0 10 10"></a-entity>