From 2663b642e0ed9080fc8528dd32a7f85e58a8ec10 Mon Sep 17 00:00:00 2001 From: rsninja722 Date: Sat, 18 Apr 2020 17:05:26 -0400 Subject: [PATCH] new collision to reflect art work --- docs/assets/images/level.png | Bin 0 -> 9401 bytes docs/assets/js/index.js | 6 ++++-- docs/assets/js/player/player.js | 2 +- docs/assets/js/world/level.js | 2 +- docs/index.html | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 docs/assets/images/level.png diff --git a/docs/assets/images/level.png b/docs/assets/images/level.png new file mode 100644 index 0000000000000000000000000000000000000000..4af8de36186f092bdfa3f734665e12c29a916df1 GIT binary patch literal 9401 zcmeAS@N?(olHy`uVBq!ia0y~yU_Zmaz&wG24JZ<`w>tqyaTa()7Besim4Gngy)^j> z1_lKNPZ!6KiaBp?Z_H&5vQRUC3^}qMMmj~(xfsUVd z_4jILFhj&9sEo2k!+?QdGz><=08}E3 zri0Ni7)=MGb>nEOV6-G0EeVHdNmz3B%(u2J#pk}UKnl7B75Qfn7J~}sC~Gtf7_g^< z*xS%vu<>SFMurNB(QHD?i|9;&s#>~mTrn&7jNBNvj!E2#|f>a;Kgbg>= z%$WI>lYv1~?+nx?51~;O)x%)dHb`2}nF$VUouWiONZNOplrYMob{JgRY6}kC7m&35 z;bf~NwB794G|KY4{tXx!55Au{^NmGpZZWWh2n2r!6ab&v!2#C-(!{{A}kA^q{)!Tc6GxiC&O5Hmnmw|yL9<&w! zl0rs91{e;bsbe$@K-po~q=S3!e(&4v4$a{Q@{8%(#JOZ$JJ0w=NJeQT$N`?NelF{r G5}E+w$D*hJ literal 0 HcmV?d00001 diff --git a/docs/assets/js/index.js b/docs/assets/js/index.js index b288566..bc31443 100644 --- a/docs/assets/js/index.js +++ b/docs/assets/js/index.js @@ -3,7 +3,8 @@ var page_preloader = new Preloader(); page_preloader.show(true); images = [ - "" + "assets/images/", + "level.png" ]; audio = [ @@ -68,7 +69,7 @@ function draw() { break; // playing case globalStates.playing: - camera.zoom = 2; + camera.zoom = 1; drawWorldBlocks(); player.draw(); break; @@ -82,6 +83,7 @@ function draw() { break; //building - to be used only in development case globalStates.building: + imgIgnoreCutoff(sprites.level,0,0); buildDraw(); break; } diff --git a/docs/assets/js/player/player.js b/docs/assets/js/player/player.js index 67490a5..aab8495 100644 --- a/docs/assets/js/player/player.js +++ b/docs/assets/js/player/player.js @@ -243,5 +243,5 @@ function distanceToLineSegment(lx1, ly1, lx2, ly2, px, py) { -var player = new Player(500,100); +var player = new Player(500,-100); diff --git a/docs/assets/js/world/level.js b/docs/assets/js/world/level.js index ae5e364..fe6f783 100644 --- a/docs/assets/js/world/level.js +++ b/docs/assets/js/world/level.js @@ -12,7 +12,7 @@ class block { } // create blocks -var blockData = [631,407,590,461,316,427,40,420,277,447,40,380,238,466,40,340,199,486,40,300,161,507,40,260,121,527,40,220,82,545,40,180,-407,561,1300,150,-1000,350,120,570,-281,483,120,70,-191,481,35,35,878,145,95,776,734,172,195,76]; +var blockData = [942,-184,94,507,942,191,94,507,372,411,1054,67,-316,369,1214,152,-38,270,86,107,-166,243,125,127,238,320,45,127,273,284,45,127,309,248,45,127,341,215,45,127,377,179,45,127,412,143,45,127,450,107,45,127,603,105,285,196,777,27,285,196,-989,23,175,959,154,-441,2555,51]; for (let i = 0, l = blockData.length; i < l; i += 4) { collisionRects.push(new block(blockData[i], blockData[i + 1], blockData[i + 2], blockData[i + 3])); } diff --git a/docs/index.html b/docs/index.html index 1408db0..e5212f0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -37,7 +37,7 @@ - +