alltom-glapp 0.0.4 → 0.0.5

data/README.textile

@@ -2,12 +2,8 @@ h1. GLApp - A tiny wrapper for ruby-opengl
 
 It's simple:
 
-# require "gl_app"
-# Include GLApp::Engine
-
-  <pre><code>class MyGame
-  include GLApp::Engine
-end</code></pre>
+# require "glapp"
+# Include GLApp
 # Override as many of the callbacks as you need:
 
   * setup
@@ -20,24 +16,25 @@ end</code></pre>
   * mouse_click(button, state, x, y)
   * mouse_dragging_motion(x, y)
   * mouse_passive_motion(x, y)
-# Instantiate GLApp with an instance of your engine, width, height and title, and do show.
+# If you need more control, override the default behavior of these:
 
-  <pre><code>app = GLApp.new(MyGame.new, 800, 600, "My game")
-app.show</code></pre>
-# Done!
+  * setup_context
+  * pre_draw
+  * post_draw
+  * resize
+# Call show with width, height, title, and whether to be full-screen
 
 Look at the scripts in the examples/ directory.
 In fact, here's one:
 
-  require 'gl_app'
+  require 'glapp'
   
   class MyGame
-    include GLApp::Engine
+    include GLApp
     def draw
       glTranslate(0, 0, -5)
       glutSolidCube(2)
     end
   end
   
-  app = GLApp.new(MyGame.new, 800, 600, "My game")
-  app.show
+  MyGame.new.show 800, 600, "My Game"

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/examples/sprite.rb

@@ -1,8 +1,7 @@
 require "rubygems"
 require "glapp"
 
-include GLApp::Engine
-public
+include GLApp
 
 class Texture
   attr_reader :num, :width, :height
@@ -157,15 +156,15 @@ def draw
   # change coordinate system to match screen pixels
   glMatrixMode(GL_PROJECTION)
   glLoadIdentity
-  glOrtho(0, 300, 300, 0, -1000, 1000)
+  glOrtho(0, width, height, 0, -1000, 1000)
   glMatrixMode(GL_MODELVIEW)
   glLoadIdentity
-
+  
   # draw a hedgehog in the center of the screen
   glPushMatrix
-    glTranslate(150, 150, 0)
+    glTranslate(width/2, height/2, 0)
     @sprites[@animator.frame].render
   glPopMatrix
 end
 
-GLApp.new(self, 300, 300).show
+show 300, 300, "sprite demo"

data/examples/triangles.rb

@@ -34,7 +34,7 @@ class Triangle
 end
 
 class TriangleDemo
-  include GLApp::Engine
+  include GLApp
   
   def setup
     @triangles = Triangle.boom(10)
@@ -53,5 +53,4 @@ class TriangleDemo
   end
 end
 
-app = GLApp.new(TriangleDemo.new, 800, 300, "Triangle demo")
-app.show
+TriangleDemo.new.show 800, 300, "triangle demo"

data/examples/triangles2.rb

@@ -4,8 +4,7 @@
 require "rubygems"
 require "glapp"
 
-include GLApp::Engine
-public
+include GLApp
 
 class Triangle
   attr_accessor :angle
@@ -53,4 +52,4 @@ end
 
 @triangles = Triangle.boom(10)
 
-GLApp.new(self, 800, 300).show
+show 800, 300, "triangle demo"

data/glapp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{glapp}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Lieber"]

data/lib/glapp.rb

@@ -1,58 +1,106 @@
 require 'rubygems'
 require 'opengl'
 
-class GLApp
-  def initialize(engine, width, height, title = "")
-    @engine = engine
+module GLApp
+  attr_reader :width, :height, :title
+  
+  def show(width, height, title = "glapp", fullscreen = false)
+    glutInit
+    glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH)
+    
     @width = width
     @height = height
     @title = title
-    @running = false
-    self.gl_init
+    
+    fullscreen ? go_fullscreen : go_windowed
+    setup
+    
+    setup_context
+    wire
+    glutMainLoop
   end
+  
+  def go_windowed
+    if glutGameModeGet(GLUT_GAME_MODE_ACTIVE) != 0
+      glutLeaveGameMode
+    end
 
-  def update(seconds)
-    @engine.update(seconds)
+    unless @window
+      glutInitWindowSize(width, height)
+      @window = glutCreateWindow(title)
+    end
   end
 
-  def draw
-    @engine.draw
+  def go_fullscreen
+    glutGameModeString([width, height].join("x"))
+
+    if glutGameModeGet(GLUT_GAME_MODE_POSSIBLE)
+      glutEnterGameMode
+      if glutGameModeGet(GLUT_GAME_MODE_ACTIVE) == 0
+        go_windowed
+      end
+    else
+      go_windowed
+    end
   end
+  
+  # begin hooks
 
-  def keyboard(key, modifiers)
-    @engine.keyboard_down(key, modifiers)
+  def setup_context
+    glEnable(GL_DEPTH_TEST)
+    glEnable(GL_BLEND)
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+    glutIgnoreKeyRepeat(1)
+  end
+  
+  def setup
   end
+  
+  def pre_draw
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+    glMatrixMode(GL_PROJECTION)
+    glLoadIdentity
+    gluPerspective(30.0, width / height, 0.1, 1000.0)
 
+    glMatrixMode(GL_MODELVIEW)
+    glLoadIdentity
+  end
+  
+  def draw
+  end
+  
+  def post_draw
+    glutSwapBuffers
+  end
+  
+  def update(seconds)
+  end
+  
+  def keyboard_down(key, modifiers)
+  end
+  
   def keyboard_up(key, modifiers)
-    @engine.keyboard_up(key, modifiers)
   end
-
-  def special_keyboard(key, modifiers)
-    @engine.special_keyboard_down(key, modifiers)
+  
+  def special_keyboard_down(key, modifiers)
   end
-
+  
   def special_keyboard_up(key, modifiers)
-    @engine.special_keyboard_up(key, modifiers)
   end
-
+  
   def mouse_click(button, state, x, y)
-    @engine.mouse_click(button, state, x, y)
   end
-
-  def mouse_active_motion(x, y)
-    @engine.mouse_dragging_motion(x, y)
-    @engine.mouse_motion(x, y)
+  
+  def mouse_dragging_motion(x, y)
   end
-
+  
   def mouse_passive_motion(x, y)
-    @engine.mouse_passive_motion(x, y)
-    @engine.mouse_motion(x, y)
   end
-
-  def resize(width, height)
-    # avoid divide-by-zero
-    height = 1.0 if height <= 0
-
+  
+  def mouse_motion(x, y)
+  end
+  
+  def resize
     # Reset the coordinate system
     glMatrixMode(GL_PROJECTION)
     glLoadIdentity
@@ -67,72 +115,15 @@ class GLApp
     gluLookAt(0, 0, 5,
               0, 0, -1,
               0, 1, 0)
-
-    @width, @height = width, height
   end
-
-  def show
-    if glutGameModeGet(GLUT_GAME_MODE_ACTIVE) != 0
-      glutLeaveGameMode
-    end
-
-    unless @window
-      glutInitWindowSize(@width, @height)
-      @window = glutCreateWindow(@title)
-    end
-
-    self.setup_context
-    self.go unless running?
-  end
-
-  protected
-
-  def go_fullscreen(width, height, title = "")
-    glutGameModeString([width, height].join("x"))
-
-    if glutGameModeGet(GLUT_GAME_MODE_POSSIBLE)
-      glutEnterGameMode
-      if glutGameModeGet(GLUT_GAME_MODE_ACTIVE) == 0
-        self.go_windowed
-      end
-    else
-      go_windowed
-    end
-
-    self.setup_context
-    self.go unless self.running?
-  end
-
-  def go
-    @running = true
-    @engine.setup
-    glutMainLoop
-  end
-
-  def running?
-    @running
-  end
-
-  def gl_init
-    glutInit
-    glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH)
-  end
-
-  def setup_context
-    glEnable(GL_DEPTH_TEST)
-
-    glutIgnoreKeyRepeat(1)
-
+  
+  # end hooks
+  
+  def wire
     glutDisplayFunc(lambda do
-      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
-      glMatrixMode(GL_PROJECTION)
-      glLoadIdentity
-      gluPerspective(30.0, @width / @height, 0.1, 1000.0)
-
-      glMatrixMode(GL_MODELVIEW)
-      glLoadIdentity
+      pre_draw
       draw
-      glutSwapBuffers
+      post_draw
     end)
 
     glutIdleFunc(lambda do
@@ -145,7 +136,7 @@ class GLApp
     end)
 
     glutKeyboardFunc(lambda do |key, x, y|
-      keyboard(key, glutGetModifiers)
+      keyboard_down(key, glutGetModifiers)
     end)
 
     glutKeyboardUpFunc(lambda do |key, x, y|
@@ -153,7 +144,7 @@ class GLApp
     end)
 
     glutSpecialFunc(lambda do |key, x, y|
-      special_keyboard(key, glutGetModifiers)
+      special_keyboard_down(key, glutGetModifiers)
     end)
 
     glutSpecialUpFunc(lambda do |key, x, y|
@@ -165,33 +156,19 @@ class GLApp
     end)
 
     glutMotionFunc(lambda do |x, y|
-      mouse_active_motion(x, y)
+      mouse_dragging_motion(x, y)
+      mouse_motion(x, y)
     end)
 
     glutPassiveMotionFunc(lambda do |x, y|
       mouse_passive_motion(x, y)
+      mouse_motion(x, y)
     end)
 
     glutReshapeFunc(lambda do |width, height|
-      resize(width, height)
+      @width = width
+      @height = height
+      resize
     end)
-
-    glEnable(GL_BLEND)
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
-  end
-
-  module Engine
-    def setup() end
-    def update(seconds) end
-    def draw() end
-    def keyboard_down(key, modifiers) end
-    def keyboard_up(key, modifiers) end
-    def special_keyboard_down(key, modifiers) end
-    def special_keyboard_up(key, modifiers) end
-    def mouse_click(button, state, x, y) end
-    def mouse_dragging_motion(x, y) end
-    def mouse_passive_motion(x, y) end
-    def mouse_motion(x, y) end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alltom-glapp
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tom Lieber