From 648ee048f345b0142db5f3973d6e701cdbc09199 Mon Sep 17 00:00:00 2001 From: SidaWang <wangs132@mcmaster.ca> Date: Wed, 12 Feb 2020 02:24:32 -0500 Subject: [PATCH] load module added, media resources were packed --- src/.DS_Store | Bin 8196 -> 8196 bytes src/__pycache__/algorithms.cpython-37.pyc | Bin 0 -> 1573 bytes src/__pycache__/game.cpython-37.pyc | Bin 10698 -> 10539 bytes src/__pycache__/load.cpython-37.pyc | Bin 0 -> 712 bytes src/__pycache__/view.cpython-37.pyc | Bin 4084 -> 4085 bytes src/__pycache__/world.cpython-37.pyc | Bin 8951 -> 8952 bytes src/{mathModel.py => algorithms.py} | 2 ++ src/game.py | 42 +++++++++++++--------- src/load.py | 13 +++++++ src/main.py | 18 +++++----- src/media/.DS_Store | Bin 0 -> 6148 bytes src/{ => media}/bgmusic.wav | Bin src/{ => media}/build.wav | Bin src/{ => media}/destroy.wav | Bin src/{ => media}/icon.png | Bin src/view.py | 2 +- src/world.py | 7 ++-- 17 files changed, 56 insertions(+), 28 deletions(-) create mode 100644 src/__pycache__/algorithms.cpython-37.pyc create mode 100644 src/__pycache__/load.cpython-37.pyc rename src/{mathModel.py => algorithms.py} (96%) create mode 100644 src/load.py create mode 100644 src/media/.DS_Store rename src/{ => media}/bgmusic.wav (100%) rename src/{ => media}/build.wav (100%) rename src/{ => media}/destroy.wav (100%) rename src/{ => media}/icon.png (100%) diff --git a/src/.DS_Store b/src/.DS_Store index d0ab1934098e6cfd1743bed893a60f2bdc8a3238..af9d3ebe10f948bd00133c01b476457d34aa42aa 100755 GIT binary patch delta 246 zcmZp1XmOa}&nUhzU^hRb_+%b|*^}=I7)&k|)SG-+Fo8djp@boW!IvSQA%!88A!o9a zkZL_ELoSe=!jQ?3=$VtBoRpKF#K6EHz`($$0Hl}v2Lm9BfdNTnPP$=ma(-?BSR6ti z$>!#}xIoR}cz$By%$Gk8I-=^&%};@<P-DQMq#y&?ipfbrp{(sdL*`BH6O!6|P3R%x P=E*!I%$wOI{;~rA=GsLk delta 258 zcmZp1XmOa}&nUJrU^hRb*km4o+1lI;Net->xeTQY#SEDY$qaf7<qU}oWu7_t$w@i+ zNem1O0t^g{;y`-F<T(P?v7A8lr9hQA3@O;vGOPruulNrJKwS(B+(4D7K+{VYiWu@4 zDzWQgYz5nJM!-^$1MH4`hCHCk0w9@=?v}~l1oHV)fo{zJx-<`{x|kt%@&f_U$(@1% llbwYESVe&@D4CokB(-^y&_l+}2V`8BCpPeGW|#QO4gmM)K~Vqz diff --git a/src/__pycache__/algorithms.cpython-37.pyc b/src/__pycache__/algorithms.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..2c31d8f57d40af974a4eecd9baad0df29e272062 GIT binary patch literal 1573 zcmcIkL2uJA6t?4b>&glf2SA8}Pl%$iPJ<Jg5HKcf7eE_aCd8IGZWqxemF<qT%1-0A zAaUWuiJy`y64L$xCqCOvN!RU&BfmU<dGE9H-j}>=H0lK7``3++YgIyi*+nq|IL|RP zhl$7@iD(pjA$v4pQ3dxPsz!6TvuJ*oG;8Ne2on^>jtV9S$p)rghsnqXc1ll!Q)Y;v z89l@0ykO!n>oF1#AD7WA$XJ_!oQ{6;7edIs(fpvF>e$3-a=_Cz57l98RH%l$ucU}I za2_TRSJDhrqPaPe{IHvfPj!wV(!_*u5+@xz2n{c&R_gBY+fao)X{6F_`DilSvIyo+ zxf%4k(r(|C34iR9cl?g!Oy|4Z_b*G16THqeNi)b9;Jm8RK@v49d96sy=}At9IURi? zs)l<0S#7=7IB84Clh&(L40;lDtzMi+p~ALlX(d`=x09;a9QE`{f0!>Msp^H@cqDCi z^c)On)ae7NtO%xBX9Ha8p1?6^-We_0mr+CSk}PnRSzB&dM8_=)MnCzuBs?4!Oi46J z<D9+$l4~hUs(2gIHmVaJqn`g7{6E_=-um)hp5v`aGjMguukCJbynC~=zq`G+*{mpA z8fB%eYys80HMSw%EWpbbJUI$|3rk<<#q0DQRSm3#Ww68Ew=rFzf8fi>NXG6E=$_q1 zft`N=0S*Lq5;Kc{VUh)Z!sD~9LOhS(-N(!#z%MYDW8h=2S;S`n$C=B_WuzSAd1jF^ z^Hn@P#xr}Ka#k7fF`mco1v@!m8Sz;j@mU4Z*>eA;?Xl3EhL5E(v5@Y=wwe}$L&;0O z8h*0Ohs%7#KjXXP8XDni50kOdora*XX?f)|xu~#)rQI*~x(^ZQMHo`uqQ#|dVEr0o j_JLEfQ=fxNbWXZXwYBwL8V$Pgnf-@5(N<XPW^L&&o1b41 literal 0 HcmV?d00001 diff --git a/src/__pycache__/game.cpython-37.pyc b/src/__pycache__/game.cpython-37.pyc index b6f8a5511f12e0adbdb941ee0e97963df47a9745..36a0a01a8bcd3b94510fe282724ad1092e0631c0 100644 GIT binary patch delta 2679 zcmZ8iON<=F8Sd)Gyk}=;cV_mz#_L_rwx2wNAYu((uh&3`jq%t#N(rs@RC#xHyQhch zo_!dHMPLabBn~toyd+E%$&uiIG>3>ot`W&05f>!tLKL{{jT4tBasIy=d)M2o{{Fwd z`s?xk_1E8jZ+v!P>r}Cr)8P5)=E95bKBj5kW8?N?f^rhR@CeZ~rZM7aKB0u5u6w#~ zP($g4XZjYklx}({KTXq0x4g_nv`u+gKSy(lOM7|0Knp+jZxxk6#_RJ-w4}(a*YB5U z*&m<-s-5!&=^#v!^D4BWWR+HxtkIg1Lv%>VVLGfN*zwxR2-8M1mS45RzxgN~yTcSJ zn$n9S+K{%&`jkOsWt>->309($te@^<WqJ=Ap!?Y%onjSwfDhf6W>r1~Ll0E6PYIo2 zHF}U$Y5j4H4YA?t8XM;MmDv^hb%P#axrSzsY-1E{A~USD)(TreJN^fGx_WNg0D2o^ zz70Xuwhsct6Z*YdO;GMUXoOFA1AuFkFpcWmSTS7_&~h!nl$!!fyXiNyD})iIU(e7C zGnjc@qglmSECpPSrCA2JJj=2i$O6l=0>~mOvObV~ti<}S|3afBR%Qc0^s_-$0a<2M zRs%VZxCo~(!bYK8VPk9@Wc3Zr)M%|ojfV&+#_yP?@-pMLo6CW4He~#rIa;d0_HA2Q zVYkDDsP!_|HDVnAa<2Dg>SKMj4^)A15EXzk5Uy;?_c?315f=rZw*PnQ)-6$t&t{L7 z=b$aKE@RGRFKDicqw!nW=}X6O^br8NB%VME(v~C?lSogf_Em9M$v_fE5?7MTk~Ae* zmV`+XiC>|mg0rYS4sfk!<_JkmVY?RR^CR_XP;Ff;Ae2tTQ`oyRZW)?4dQauY2$_wS z3i}S>X4DSUUL^68ZRl)6>g?+7W#cajRr06aUkm>sTNsfg_|%hx<^t$;P8x1|Q((G? zS%eh;nPz-Ra2`s_jokMA!o!{!gjEC|z|JMR##kg#!8vGp({bBN9;fMzL=kN?xDP`m z0)!62-NBLNB_26`5J5USYrGi+;>+GkrO!$E5*ROi_yInDdkmJGi;tBjQ+1rejxUst z&pijKOgr5UgQK;r<fwEO2^($H+AeB$FDOm}_pjbx%4MC*#Qz-JpX#E~;rOS)8B&kO zE0a&CFmD1&t+2y66Iaked7ykzZtOVkVDFwqHh}x7_gZDzP~lfmw~d|P-zM-N5*AYy zEby@IB2+3Xz^>bKC_)V`;DFs-ccx5i4d{($hxgZ2xU8t#@wmXeSGi;7lcQ8&JqfIg zJHyo}<uLjx^`NuYw=LiYdpC#Yj8V*6@e+c%NtxwV<U~A-L_PlR*vtdZW6!++GIzP# z@>nD2wwW|Lp1UbdAe~xowOOz((-Gf@x`K-r;%CP18NkH1v%8ZletrD-G|seVGqMlT z#t*t7cRGTH;e79#@vq6RTVQ$4Hr2gKa{IS9b{*$U?VcCeor6_5bN5Ng(wzm8ByIML zed{{ui(lS9vW0msNkfu(Nlr_vaejVbF}ahuUtT(U-f5g)Ts$pPi;ac(^NZpPu7<uz z<Kq0O<WfDNnjUY9<JgNX!oD#BWh&hCF9)7@2OAayif`=kz9b8<yH&oKIKS4Lnkwth zVltcqH}Q`k-b27`ir*u=kMIEiB!^1#PmsVB_Drn;i!%%EaW~}e_1>H|$s<Ly#KI~r z0#IY^{?<7-sd;2neLMu3OfeV~acQl$ShOroV(*FgtC@+1)tZ0Awjy^f(QlC36Z$MT z2Z!3a%0G)I4*t0xOFuX!ttM<qh%@mI2aims8TSlK!$2n7^)KV2^#f!mex^RXB~34I znJVkzC@yvk;ROWzd#EC<4kyWHRTQvP2)xPyb6&iQ@H>Q05&nR16XA0JS#+GH=Z0aE zd!FO$_+qQNKB)=yFF+segD=FZld)1ny+-_Fee7BFYdb7+j&r4pw*h9+!Ad2C!2h>2 z*IImCm`JKCY$2I*y`@03qGdmn`DWmGP(`7dh9Zr2C*sZ7h0!n6=&0p$xY40B!p%^X zdqLw{vm+0x+ED0-pb2-#K{Ig*2QT8Vd}DFp;?ozL#*=hWyo~f!glqA)vtwHyq52BK zs|arc$kcP{RtxlJCk}~*L6Dg_KVV&tKZ<26L{ADNc{55P_Ujq4>oxj_NybUWG!0WX LiTW}F#6<P~<Hk$H delta 2862 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 NBG6IL86@&m{|_q<d@le1 diff --git a/src/__pycache__/load.cpython-37.pyc b/src/__pycache__/load.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..9d7e2554077144c7559c97dfdceb2397c6aef236 GIT binary patch literal 712 zcmZvZ&u-c<9LH@phJ-(*rQHsF19~7YFij)SA=CjHfx~>56k?BsCNZ*;t#IAB?*ON2 z(w@lIUB)ZyG&`(JnrbUwe}Deu_ltjySFcxq9`7H!AAcYKewyHEINH3?kNl;D0t#b5 z%!*=|AcCOrC-KP?Fl&joB?gw|txYY8cW4KRqjxLI>T$QUL$plo2SjTB5$8zihHU@k zREkQc4AE*aYk#ZN>FExA!=zD=20f$aN75|F*)us81v!6)To$BBp$}Rw_PSdzYC(m) zn1^@Tz-xsQMx$V3M<Gw!t8}q(=6Mv;_SfLc+m>!tW`YGtq(PN39q_e5o9cX#<T46P z&_V+0%7yHWBjt?UXSrY-#}iR_XX-w^gf-XREQRd#&jA~!F9InK-}f_~vV$E4V$O@~ z3x&8Ocy10ZOp0<=>qX46_99lLgC#ghf(27n%mb>dRgisF){;l5vIgDpNZEo(o{NwP z%M_@1v%$NbKc0<xs@A*lr<3uAL)7p(-P``ekm1Z9bP4t*gYGTC{Yl673HGPs(G9`F z&cqvk2cl_uG4lJ`ok=F7E7-l;<6)k#G?T8rJr;`KQ|3w$y5?~0)mquF5>E4&y*4){ SFSXdH25s~bUg>$zEBFU}6}(db literal 0 HcmV?d00001 diff --git a/src/__pycache__/view.cpython-37.pyc b/src/__pycache__/view.cpython-37.pyc index bd4fe5ac6eee6eecf188357f2dfb77442d3f0828..5b3ae743d05c563c82b9add829fb25b2c5ee6db9 100644 GIT binary patch delta 55 zcmew&|5cvXiI<m)0SMMCca96*$g9sU#+8_po?nz%l95|{i@CV6xJVHweQR<czX{{5 I$!+|30M3aKc>n+a delta 54 zcmew=|3#kHiI<m)0SJD%IL8HT<kjaF<;+bi$?(ljNzJ*%TwGaPqzIIanjFM$!WcEV Hoj(r%t78wu diff --git a/src/__pycache__/world.cpython-37.pyc b/src/__pycache__/world.cpython-37.pyc index 64554f0e4920f87b101ce499e30ca544c08d14f7..e179e3b99f50aaf95faabd97c24e8897249063fa 100644 GIT binary patch delta 913 zcmaix-%Aux6vyYx%+8MM{&L%OcG_8WcPpD!^G9VrF!Kjus9DiZub~KcYqedCSs@A| z=&_fOi!UJsy$C@lO+5rX^xU5?g%1Tr_!I>85_HeiA|hxm^Euyp&bjxVbMMx`_kmDf zC=`(Rx3SVcF}N7YbrXq76iPrqSeeMeDn#K{E~ytVu9SRbjc9;cE&0nj(S?>5XESG{ znFy6kiTZE&oJWNysVV&O=y6HtDpN8f8W3@1CRR`;chPDRr$LgSAyP}j#Gnz9q)}oP zU~%1!!g<L~e8D<LZSWxP8jz5=X;FU2;ISrcFXuTe4?XUJmH}vEkNsVo@BJn_8!@4o zh4mDSyLo*<hIY0RxB}N+RIdUYVr#*4{s`aLRve2PCx<wONdHD1st%63?pAOeLTxw) z4!%enWus@*_BjSd+7U@aC!&kPuG-n1jYQIQ&FIz;f1QDaJaq3z;&PoR;pjhdaL=di z%bFoMD#DGJvmarzaQuMp1edSe-uNfTcXRpQzOcM^Y_xV62H9q9qwf@-e_)33RTF)5 zvT*Vsd}Mve4P%Ihwi^>Y?cCTfJ8ABLO_!P}xw;=yMi8gjgH&fz9%U0kH2p`h+~=v4 z;@mAyEl$&dGt4$qS@_1n)^j+_-dOv5Sbl_kwpO)ExWQ$%oVFn0zD~ad7-M(pTft(_ z>X*3gX=sH;cC(>4(u$d)@Z+fP(Hy+h?We%I5%1w(mpgT$x`@E@oH4`%Vv;?{8k!U1 z+Gf3(j+|1tUGdcN)O^v?oT*tlS9S;wdV#6Z^*LvHzF4lXrOZ8T99LguyR&O8pyQBr Z2=al9Dq&E;0$ouRRaQa#dW`#2`6tI{w~hb+ delta 912 zcmaix&ubGw6vy|?PBz<ilcq84W=YZ}X-!Q^6KQJ|tv_0c*s2w6sdW^kIDuG`R<?pz z3W7)RQU*OpQE!4EEnP2y2XFojMyLnDAM|2R^&&WLTBV3!mVDlK=DnHuzL_7z&0=6E z5UAJWFIhZ(rLY)iKQgXyjgty6P?0dAqRw;`DWfv#6<^h024F3%_^T!}m4?Nc)LEEr z<eH;#{|%q}xD;YdrQb7VL{qxX(QJ*^t2~_!m*~}9yn#iy#hQ75weTRbc_WMR5OYdo zaV;AnV_LTP8~V&b4RWKN4b22Py>9&{0VcYP-IC{w931u*j1)j#Jn;`me(*bx5#Rj@ z5jJg@^m66`fr5BmKMB`X8<qij#EO;3?Zb_AH!g$Qj@XY#{6Q<Ky%O`@rnLrvJdQy^ zE>cJ3ab`5@b8XBN5K%-Q;-EyfZpZG*kz-))uQSld1MgmAgtRIP{r{-JJ)e57nnp-S zr88L5iP$58k-YDal&jug<P+our2KDRXz!gEZCQe%Sa0d{osi@A!nQXI)kmKQMtk9- z7>a(jPs-F*W2&d^8ygl!oeucwaVJI^2C-xWaZ22e^><}a<`7+o9cJZ_(Yf;M?HVm# z=OuSotjE%@A%gLj&@0}=Gd{F$i7)YGV+_}hi={*y!rtq|TYw2M-&O!eyl8tU^|53D zI>gOn`E)l{D&q%G;iI{Dt6NWjccb3J#V)sfqB@Vj^V|u<CB$X%ENvTZSn7-zO!cJe zs#CYhXJ&b+Qq$+|%+)B4Ylb^D!)L4R1z9H^rS2M&xcH)orB}L%3F;#jSW;OKf*??c QOHFl3D5$>~mUEQ+0x_Gkr~m)} diff --git a/src/mathModel.py b/src/algorithms.py similarity index 96% rename from src/mathModel.py rename to src/algorithms.py index 6d78ff0..965679a 100755 --- a/src/mathModel.py +++ b/src/algorithms.py @@ -1,4 +1,6 @@ SECTOR_SIZE = 16 + + def normalize(position): """ Accepts `position` of arbitrary precision and returns the block containing that position. diff --git a/src/game.py b/src/game.py index f67281f..837d4d4 100755 --- a/src/game.py +++ b/src/game.py @@ -1,21 +1,29 @@ from __future__ import division - -import time from block import Block from view import View from world import World -from mathModel import * +from algorithms import * +from collections import deque +from pyglet import image +from pyglet.gl import * +from pyglet.graphics import TextureGroup +from pyglet.window import key, mouse + +import load +import time import os import sys import math import random import time -from collections import deque -from pyglet import image -from pyglet.gl import * -from pyglet.graphics import TextureGroup -from pyglet.window import key, mouse +#Version Controls +if sys.version_info[0] >= 3: + xrange = range + if sys.version_info[0] * 10 + sys.version_info[1] >= 38: + time.clock = time.process_time + + TICKS_PER_SEC = 60 @@ -38,17 +46,17 @@ JUMP_SPEED = math.sqrt(2 * GRAVITY * MAX_JUMP_HEIGHT) TERMINAL_VELOCITY = 50 PLAYER_HEIGHT = 2 -if sys.version_info[0] >= 3: - xrange = range - if sys.version_info[0] * 10 + sys.version_info[1] >= 38: - time.clock = time.process_time +class Game(pyglet.window.Window): + + #Blocks intialization + + global BRICK, GRASS, STONE, MARBO + BRICK = load.BRICK + GRASS = load.GRASS + STONE = load.STONE + MARBO = load.MARBO -BRICK = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Brick.png")) -GRASS = Block((0, 0), (0, 1), (1, 1), 2, os.path.join("texture","Grass.png")) -STONE = Block((0, 0), (0, 0), (0, 0), 1,os.path.join("texture","Stone.png")) -MARBO = Block((0, 0), (0, 0), (0, 0), 1,os.path.join("texture","Marbo.png")) -class Game(pyglet.window.Window): def __init__(self, *args, **kwargs): super(Game, self).__init__(*args, **kwargs) # Whether or not the window exclusively captures the mouse. diff --git a/src/load.py b/src/load.py new file mode 100644 index 0000000..47dd6cf --- /dev/null +++ b/src/load.py @@ -0,0 +1,13 @@ +import os + +from block import Block +from pyglet.gl import * + +ICON = pyglet.image.load(os.path.join("media","icon.png")) +BUILDSOUND = pyglet.resource.media(os.path.join("media","build.wav"),streaming=False) +DESTROYSOUND = pyglet.resource.media(os.path.join("media",'destroy.wav'),streaming=False) +BACKGROUNDMUSIC = pyglet.resource.media(os.path.join("media",'bgmusic.wav')) +BRICK = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Brick.png")) +GRASS = Block((0, 0), (0, 1), (1, 1), 2, os.path.join("texture","Grass.png")) +STONE = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Stone.png")) +MARBO = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Marbo.png")) diff --git a/src/main.py b/src/main.py index e0e33a4..4ddbb26 100755 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,7 @@ +import os +import load from pyglet.gl import * - from view import View from game import Game @@ -8,15 +9,16 @@ WINDOW_WIDTH = 800 WINDOW_HEIGHT = 600 def main(): - game = Game(width=WINDOW_WIDTH, height=WINDOW_HEIGHT, caption='MineCraft', resizable=True) - icon = pyglet.image.load("icon.png") - game.buildSound = pyglet.resource.media('build.wav',streaming=False) - game.destroySound = pyglet.resource.media('destroy.wav',streaming=False) - game.backgroundSound = pyglet.resource.media('bgmusic.wav') - game.set_icon(icon) + + + game = Game(width=WINDOW_WIDTH, height=WINDOW_HEIGHT, caption='CraftMaster', resizable=True) + game.buildSound = load.BUILDSOUND + game.destroySound = load.DESTROYSOUND + game.backgroundMusic = load.BACKGROUNDMUSIC + game.set_icon(load.ICON) # Hide the mouse cursor and prevent the mouse from leaving the window. game.set_exclusive_mouse(True) - game.backgroundSound.play() + game.backgroundMusic.play() pyglet.app.run() diff --git a/src/media/.DS_Store b/src/media/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..73111e2b499d73306f523e893afa548e86dd9a75 GIT binary patch literal 6148 zcmeHKO-sZ;41Li(RC?*r<NN}_e^8d)gJ=JMc2^dmT2Z^=t^ZtKCQ+;w){_)TVDi#T zG9M2*GXWsWetQm7017rmQDZ{XJ=t~S!3(0~F`jUX4bJd_>xqHp=+d>9Xt2W_dVF2~ z{-W(RP1`k$sNTK_eJ9N7x!)FB-|?Z0l94x@;~9_W@cPTFB6Hf|p79UVy94W*Bg?U- zU?3O>27-Y(F~B=pr6>(U2Lr)CF!0HMo)3vlv348`^U*<-O8}xiqqES~T0(P@W9>K? zvWFs;O0-n*5<@JV{^W7B<6vm%5HCK&XZ|Q&B+t(AQx1pJhM|LjU|`I^v3*v0|F8MW zOcwd$l=un;f`Na=fGk#*t0gz(ck7Ss>0O)HuGmyGZcu|ld-Mq4hn^#+xzqZS+Kj6m W2SXi2{W+Z&4}nZbs9@j^7<dPoLul{- literal 0 HcmV?d00001 diff --git a/src/bgmusic.wav b/src/media/bgmusic.wav similarity index 100% rename from src/bgmusic.wav rename to src/media/bgmusic.wav diff --git a/src/build.wav b/src/media/build.wav similarity index 100% rename from src/build.wav rename to src/media/build.wav diff --git a/src/destroy.wav b/src/media/destroy.wav similarity index 100% rename from src/destroy.wav rename to src/media/destroy.wav diff --git a/src/icon.png b/src/media/icon.png similarity index 100% rename from src/icon.png rename to src/media/icon.png diff --git a/src/view.py b/src/view.py index dccc57e..48829c4 100755 --- a/src/view.py +++ b/src/view.py @@ -1,4 +1,4 @@ -from mathModel import * +from algorithms import * import sys import math diff --git a/src/world.py b/src/world.py index 17a6de8..5e718e3 100755 --- a/src/world.py +++ b/src/world.py @@ -1,19 +1,22 @@ -from mathModel import * - import sys import math import random import time +from algorithms import * from collections import deque from pyglet import image from pyglet.gl import * from pyglet.graphics import TextureGroup from pyglet.window import key, mouse + +#Version Controls if sys.version_info[0] >= 3: xrange = range if sys.version_info[0] * 10 + sys.version_info[1] >= 38: time.clock = time.process_time + + TICKS_PER_SEC = 60 # Size of sectors used to ease block loading. -- GitLab