diff --git a/main.py b/main.py index 5939f13..965f42b 100755 --- a/main.py +++ b/main.py @@ -8,7 +8,6 @@ import pygame.freetype from gyro import * from lines import * - def deg2rad(rA): return rA/180*PI I = complex256(complex(0,1)) @@ -57,7 +56,7 @@ def draw(level,gPlayer,fov,res): cInt = cLineIntersection(tA,tB,complex256(0),rot) except ZeroDivisionError: continue - rDist = cDist(0,cInt) + rDist = cDist(0,cInt) if not (j.isFinite and cBetween(tA,tB,cInt)): continue if cDot(cInt,rot) > 0: @@ -66,7 +65,7 @@ def draw(level,gPlayer,fov,res): m = DrawnSegment(1-rDist,j.color) drawn.append(m) return drawn - + def cap(rN): if rN < 0: return 0 @@ -75,7 +74,7 @@ def cap(rN): def mainLoop(): gPlayer = GyroVector(0,1) display = pygame.display.set_mode((1280,720)) - font = pygame.freetype.Font(None,24) + font = pygame.freetype.Font(None,18) while True: framestart = time_ns() @@ -84,7 +83,7 @@ def mainLoop(): return True if event.type == pygame.KEYDOWN: if event.key == pygame.K_q: - gPlayer.cRot *= -1 + gPlayer.cRot *= -1 keys = pygame.key.get_pressed() if keys[pygame.K_d]: gPlayer.rotate(ROT) @@ -103,17 +102,19 @@ def mainLoop(): for i in drawn: pygame.draw.rect(display,i.color, (n,360 - (cap(i.height) * 360),10,cap(i.height) * 1000)) n += 8 - font.render_to(display, (20, 150), str(gPlayer.cPos), (0, 0, 0)) - font.render_to(display, (20, 250), str(gPlayer.cRot), (0, 0, 0)) + + font.render_to(display, (8, 8), "cPos: " + str(gPlayer.cPos), (255, 255, 255), (0, 0, 0)) + font.render_to(display, (8, 26), "cRot: " + str(gPlayer.cRot), (255, 255, 255), (0, 0, 0)) + pygame.display.update() - + frameend = time_ns() sleep((frameend-framestart) / F_) - return True + return True def main(): pygame.init() - pygame.display.set_caption('P3HE') + pygame.display.set_caption('P3HE') if not pygame.get_init(): return False retstatus = mainLoop()