Index: ADME.md =================================================================== --- README.md (revision 185faa0119e6c35d1190ed7d4cc178af983741e0) +++ (revision ) @@ -1,24 +1,0 @@ -On linux, you need to install tkinter: -sudo apt-get install python3-tk -sudo apt-get install python3-opengl - -On mac, install pygame like this: - -brew install python3 - -# Not sure if this is actually needed -brew install sdl sdl_image sdl_mixer sdl_ttf smpeg portmidi - -pip3 install pygame -pip3 install pyobjc -pip3 install PyOpenGL PyOpenGL_accelerate -# PyOpenGL_accelerate is needed on OSX, not sure if it's needed on -# other platforms - -On Windows, install python3 (which should install pip) and then: - -pip install pygame -pip install pyopengl - -Run the game with: -python3 game.py Index: game.py =================================================================== --- game.py (revision 185faa0119e6c35d1190ed7d4cc178af983741e0) +++ game.py (revision 3960923533ce45b213216e1d1139ec62a623a577) @@ -1,120 +1,7 @@ -import pygame, OpenGL, math +import pygame, platform -from OpenGL.GLU import * -from OpenGL.GL import * - -import platform +system = platform.system() [w, h] = [0, 0] -fullscreen = True - -def render(surface, overlay, font, showOverlay): - #glEnable (GL_BLEND); glBlendFunc (GL_ONE, GL_ONE); - - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - - render3d(surface) - - if showOverlay: - renderOverlay(overlay, font) - projectOverlay(surface, overlay) - - -def renderOverlay(overlay, font): - #pygame.draw.rect(overlay, (0, 0, 255), pygame.Rect(0, 0, w, h)) - #pygame.draw.circle(overlay, (255, 0, 0), (int(w/2), int(h/2)), 540) - #overlay.set_colorkey((255,0,0)) - overlay.fill((0, 0, 0, 255)) - - text = font.render("2D drawing", True, (0, 128, 0)) - - pygame.draw.rect(overlay, (0, 128, 255), pygame.Rect(30, 30, 60, 60)) - pygame.draw.rect(overlay, (128, 255, 0), pygame.Rect(300, 300, 1000, 1000)) - - overlay.blit(text, (500, 100)) - -def projectOverlay(surface, overlay): - - glPushMatrix() - - glColor3f(1.0, 1.0, 1.0) - - glTranslatef(0.0,0.0,-zNear) - - textureData = pygame.image.tostring(overlay, "RGBA", 1) - width = overlay.get_width() - height = overlay.get_height() - - glEnable(GL_TEXTURE_2D) - - glBindTexture(GL_TEXTURE_2D, glGenTextures(1)) - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, textureData) - - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT) - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT) - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST) - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST) - - glBegin(GL_QUADS) - - glTexCoord2f(0.0, 0.0) - glVertex2f(-(w/h), -1) - - glTexCoord2f(1.0, 0.0) - glVertex2f((w/h), -1) - - glTexCoord2f(1.0, 1.0) - glVertex2f((w/h), 1) - - glTexCoord2f(0.0, 1.0) - glVertex2f(-(w/h), 1) - - glEnd() - - glDisable(GL_TEXTURE_2D) - - glPopMatrix() - -def render3d(surface): - vertices = ( - (1, -1, -1), - (1, 1, -1), - (-1, 1, -1), - (-1, -1, -1), - (1, -1, 1), - (1, 1, 1), - (-1, -1, 1), - (-1, 1, 1) - ) - edges = ( - (0,1), - (0,3), - (0,4), - (2,1), - (2,3), - (2,7), - (6,3), - (6,4), - (6,7), - (5,1), - (5,4), - (5,7) - ) - - glPushMatrix() - - glColor3f(0.5, 0.5, 1.0) - - glTranslatef(0.0,0.0,-2*zNear) - - glBegin(GL_LINES) - for edge in edges: - for vertex in edge: - glVertex3fv(vertices[vertex]) - glEnd() - - glPopMatrix() - -system = platform.system() if system == 'Windows': @@ -123,20 +10,7 @@ import ctypes user32 = ctypes.windll.user32 - w = user32.GetSystemMetrics(0) - h = user32.GetSystemMetrics(1) + [w, h] = [user32.GetSystemMetrics(0), user32.GetSystemMetrics(1)] elif system == 'Linux': print("Linux detected") - - import tkinter - root = tkinter.Tk() - w = root.winfo_screenwidth() - h = root.winfo_screenheight() -elif system == 'Darwin': - print("Mac detected") - - from AppKit import NSScreen - res = NSScreen.mainScreen().frame().size - w = int(res.width) - h = int(res.height) else: print("Unknown OS: " + system) @@ -146,40 +20,15 @@ pygame.init() -if (w == 0 and h == 0) or not fullscreen: +if w == 0 and h == 0: print("Not using fullscreen") - [w, h] = [800, 600] - gameDisplay = pygame.display.set_mode((w, h), pygame.DOUBLEBUF|pygame.OPENGL) -elif system == 'Darwin': - # get around the osx opengl fullscreen bug - # I should also see if this bug occurs in pygame without opengl - gameDisplay = pygame.display.set_mode((w, h), pygame.DOUBLEBUF|pygame.OPENGL) + gameDisplay = pygame.display.set_mode((800, 600)) else: - gameDisplay = pygame.display.set_mode((w, h), pygame.FULLSCREEN|pygame.DOUBLEBUF|pygame.OPENGL) - -# Look into pygame.HWSURFACE for hardware-accelerated surfaces -overlay = pygame.Surface((w, h), pygame.SRCALPHA) + gameDisplay = pygame.display.set_mode((w, h), pygame.FULLSCREEN) pygame.display.set_caption('Space Game') clock = pygame.time.Clock() - -font = pygame.font.Font(None, 36) running = True -showOverlay = False - -zNear = 1.0/math.tan(math.radians(45.0/2)) - -# not really need here since there are no previous -# matrix modifications, but keeping it for reference -#glLoadIdentity() -gluPerspective(45, (w/h), zNear, 500.0) - -''' -# Use glFrustum to focus the camera at a point other than the screen center -zNear = 1.0 -glFrustum(-1.5, 0.5, -1.0, 1.0, zNear, 500.0) -glTranslatef(0.0,0.0,-5.0) -''' while running: @@ -190,10 +39,8 @@ if event.key == pygame.K_ESCAPE: running = False - elif event.key == pygame.K_SPACE: - showOverlay = not showOverlay - render(gameDisplay, overlay, font, showOverlay) + #print(event) - pygame.display.flip() + pygame.display.update() clock.tick(60)