Added Lib.libraries(). Fixed some issues. Added sample test program

Author: ColonelThirtyTwo

glfw_base.lua

@@ -64,9 +64,14 @@ Lib.joystickPresent    = wrap(glfw, "glfwJoystickPresent")
 
 -- Functions with special Lua code
 
+-- Shortcut for localizing libraries
+function Lib.libraries()
+	return gl, glc, glu, glfw, glext
+end
+
 -- Throws an error on failure
 function Lib.init()
-	if glfw.glfwInit() ~= 0 then
+	if glfw.glfwInit() == 0 then
 		error("glfwInit failed",0)
 	end
 end
@@ -131,6 +136,14 @@ function Lib.getPrimaryMonitor()
 	return monitor
 end
 
+-- These functions can't be jit compiled, because they may call callbacks.
+-- Don't use wrap because jit.off affects the prototype, which will affect other functions too.
+Lib.pollEvents = function() return glfw.glfwPollEvents() end
+jit.off(Lib.pollEvents)
+
+Lib.waitEvents = function() return glfw.glfwWaitEvents() end
+jit.off(Lib.waitEvents)
+
 ---------------------------------------------------------------------------------------------------------------------
 -- Window
 
@@ -146,7 +159,6 @@ function Window:__new(w, h, title, monitor, share)
 end
 
 -- C functions that don't need special handling
-Window.destroy                    = wrap(glfw, "glfwDestroyWindow")
 Window.getAttrib                  = wrap(glfw, "glfwGetWindowAttrib")
 Window.getMonitor                 = wrap(glfw, "glfwGetWindowMonitor")
 Window.hide                       = wrap(glfw, "glfwHideWindow")
@@ -158,7 +170,6 @@ Window.setSize                    = wrap(glfw, "glfwSetWindowSize")
 Window.setTitle                   = wrap(glfw, "glfwSetWindowTitle")
 Window.show                       = wrap(glfw, "glfwShowWindow")
 Window.hint                       = wrap(glfw, "glfwWindowHint")
-Window.shouldClose                = wrap(glfw, "glfwWindowShouldClose")
 Window.makeContextCurrent         = wrap(glfw, "glfwMakeContextCurrent")
 Window.swapBuffers                = wrap(glfw, "glfwSwapBuffers")
 Window.setClipboardString         = wrap(glfw, "glfwSetClipboardString")
@@ -181,14 +192,6 @@ Window.setCursorPosCallback       = wrap(glfw, "glfwSetCursorPosCallback")
 Window.setCursorEnterCallback     = wrap(glfw, "glfwSetCursorEnterCallback")
 Window.setScrollCallback          = wrap(glfw, "glfwSetScrollCallback")
 
--- These functions can't be jit compiled, because they may call callbacks.
--- Don't use wrap because jit.off affects the prototype, which will affect other functions too.
-Window.pollEvents = function(self) return glfw.glfwPollEvents(self) end
-jit.off(Window.pollEvents)
-
-Window.waitEvents = function(self) return glfw.glfwWaitEvents(self) end
-jit.off(Window.waitEvents)
-
 -- Functions with special Lua code
 
 -- Returns width, height instead of needing out parameters
@@ -220,6 +223,18 @@ function Window:getCursorPos()
 	return double_buffer[0], double_buffer[1]
 end
 
+function Window:shouldClose()
+	return glfw.glfwWindowShouldClose(self) ~= 0
+end
+
+function Window:destroy()
+	glfw.glfwDestroyWindow(ffi.gc(self, nil))
+end
+
+function Window:__gc()
+	glfw.glfwDestroyWindow(self)
+end
+
 ffi.metatype(Window_t, Window)
 
 ---------------------------------------------------------------------------------------------------------------------

readme.md

@@ -22,15 +22,21 @@ Usage
 To load the library, use the `require` function:
 
 ```lua
-local glfw = require "glfw"
+local luajit_glfw = require "glfw"
 ```
 
 LuaJIT-GLFW loads the following libraries:
 
-* `glfw.gl`: OpenGL
-* `glfw.glu`: GLU
-* `glfw.glfw`: GLFW
-* `glfw.glext`: A table that, when indexed, loads and returns the specified extension function. Ex. `glext.glMyExtFuncARB(p1, p2)`
-* `glfw.glc`: `#define`d values for OpenGL and GLFW (this must be a Lua table instead of `static const` values, because OpenGL uses `longs` in a couple of places)
+* `luajit_glfw.gl`: OpenGL
+* `luajit_glfw.glc`: `#define`d values for OpenGL and GLFW (this must be a Lua table instead of `static const` values, because OpenGL uses `longs` in a couple of places)
+* `luajit_glfw.glu`: GLU
+* `luajit_glfw.glfw`: GLFW
+* `luajit_glfw.glext`: A table that, when indexed, loads and returns the specified extension function. Ex. `glext.glMyExtFuncARB(p1, p2)`
+
+You can also use the following snippet to concisely localize the libraries.
+
+```lua
+local gl, glc, glu, glfw, glext = luajit_glfw.libraries()
+```
 
 Additionally, LuaJIT-GLFW wraps GLFW functions and sets metatypes for GLFW structs for convenience. See `glfw_base.lua`

test.lua

@@ -0,0 +1,77 @@
+
+-- Load libraries
+local lj_glfw = require "glfw"
+local ffi = require "ffi"
+local bit = require "bit"
+-- Localize the FFI libraries
+local gl, glc, glu, glfw, glext = lj_glfw.libraries()
+
+-- Define vertex arrays for the model we will draw
+local CubeVerticies = {}
+CubeVerticies.v = ffi.new("const float[8][3]", {
+	{0,0,1}, {0,0,0}, {0,1,0}, {0,1,1},
+	{1,0,1}, {1,0,0}, {1,1,0}, {1,1,1}
+})
+
+CubeVerticies.n = ffi.new("const float[6][3]", {
+	{-1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {1.0, 0.0, 0.0},
+	{0.0, -1.0, 0.0}, {0.0, 0.0, -1.0}, {0.0, 0.0, 1.0}
+})
+
+CubeVerticies.f = ffi.new("const float[6][4]", { 
+	{0, 1, 2, 3}, {3, 2, 6, 7}, {7, 6, 5, 4},
+	{4, 5, 1, 0}, {5, 6, 2, 1}, {7, 4, 0, 3}
+})
+
+-- Initialize GLFW. Unline glfwInit, this throws an error on failure
+lj_glfw.init()
+
+-- Creates a new window. lj_glfw.Window is a ctype object with a __new metamethod that
+-- runs glfwCreateWindow.
+-- The window ctype has most of the windows functions as methods
+local window = lj_glfw.Window(1024, 768, "LuaJIT-GLFW Test")
+
+-- Initialize the context. This needs to be called before any OpenGL calls.
+window:makeContextCurrent()
+
+local w, h = window:getFramebufferSize()
+
+-- Set up OpenGL
+gl.glEnable(glc.GL_DEPTH_TEST);
+
+gl.glMatrixMode(glc.GL_PROJECTION)
+glu.gluPerspective(60, w/h, 0.01, 1000)
+gl.glMatrixMode(glc.GL_MODELVIEW)
+glu.gluLookAt(0,0,5,
+	0,0,0,
+	0,1,0)
+
+-- Set up some values
+local rotx, roty, rotz = 1/math.sqrt(2), 1/math.sqrt(2), 0
+local boxx, boxy, boxz = -0.5,-0.5,2
+
+-- Main loop
+while not window:shouldClose() do
+	gl.glClear(bit.bor(glc.GL_COLOR_BUFFER_BIT, glc.GL_DEPTH_BUFFER_BIT))
+	
+	gl.glPushMatrix()
+	gl.glColor3d(1,1,1)
+	gl.glTranslated(boxx, boxy, boxz)
+	gl.glRotated(lj_glfw.getTime()*10, rotx, roty, rotz)
+	for i=0,5 do
+		gl.glBegin(glc.GL_QUADS)
+		gl.glNormal3fv(CubeVerticies.n[i])
+		for j=0,3 do
+			gl.glVertex3fv(CubeVerticies.v[CubeVerticies.f[i][j]])
+		end
+		gl.glEnd()
+	end
+	gl.glPopMatrix()
+	
+	window:swapBuffers()
+	lj_glfw.pollEvents()
+end
+
+-- Destroy the window and deinitialize GLFW.
+window:destroy()
+lj_glfw.terminate()