modified: OpenVGApp.lua

	modified:   bcm_host.lua
	renamed:    interface/common.lua -> common.lua
	renamed:    interface/connection.lua -> connection.lua
	renamed:    freetype.lua -> experimental/freetype.lua
	modified:   media/desktop.ppm
	renamed:    interface/message.lua -> message.lua
	deleted:    test_bcm_host.lua
	modified:   test_snapshot.lua
	new file:   tests/snapper.lua
	renamed:    test_dispmanx.lua -> tests/test_dispmanx.lua
	renamed:    test_egl.lua -> tests/test_egl.lua
	renamed:    test_egl_vg_window.lua -> tests/test_egl_vg_window.lua
	renamed:    test_egl_window.lua -> tests/test_egl_window.lua
	renamed:    test_egles_basic.lua -> tests/test_egles_basic.lua
	renamed:    test_enumdispman.lua -> tests/test_enumdispman.lua
	renamed:    test_picast.lua -> tests/test_picast.lua
	renamed:    test_tiger.lua -> tests/test_tiger.lua
	renamed:    test_triangle.lua -> tests/test_triangle.lua
	renamed:    test_window_basic.lua -> tests/test_window_basic.lua
	renamed:    tiger.lua -> tests/tiger.lua
	renamed:    interface/vc_cec.lua -> vc_cec.lua
	renamed:    interface/vc_cecservice.lua -> vc_cecservice.lua
	renamed:    interface/vc_display_types.lua -> vc_display_types.lua
	renamed:    interface/vc_dispmanx.lua -> vc_dispmanx.lua
	renamed:    interface/vc_dispmanx_types.lua -> vc_dispmanx_types.lua
	renamed:    interface/vc_dispservice_x_defs.lua -> vc_dispservice_x_defs.lua
	renamed:    interface/vc_hdmi.lua -> vc_hdmi.lua
	renamed:    interface/vc_hdmi_property.lua -> vc_hdmi_property.lua
	renamed:    interface/vc_image_types.lua -> vc_image_types.lua
	renamed:    interface/vc_sdtv.lua -> vc_sdtv.lua
	renamed:    interface/vc_tvservice.lua -> vc_tvservice.lua
	renamed:    interface/vc_tvservice_defs.lua -> vc_tvservice_defs.lua
	renamed:    interface/vcgencmd.lua -> vcgencmd.lua
	renamed:    interface/vchi.lua -> vchi.lua
	renamed:    interface/vchi_cfg.lua -> vchi_cfg.lua
	renamed:    interface/vchi_cfg_internal.lua -> vchi_cfg_internal.lua
	renamed:    interface/vchi_common.lua -> vchi_common.lua
	renamed:    interface/vchi_mh.lua -> vchi_mh.lua
	renamed:    interface/vcos.lua -> vcos.lua
	renamed:    interface/vcos_assert.lua -> vcos_assert.lua
	renamed:    interface/vcos_init.lua -> vcos_init.lua
	renamed:    interface/vcos_platform.lua -> vcos_platform.lua
	renamed:    interface/vcos_platform_types.lua -> vcos_platform_types.lua
	renamed:    interface/vcos_semaphore.lua -> vcos_semaphore.lua
	renamed:    interface/vcos_types.lua -> vcos_types.lua

OpenVGApp.lua

@@ -18,55 +18,6 @@ local OpenVG = rpiui.OpenVG;
 local egl = require "egl"
 local VG = EGL.Lib;
 
-local PS = require "PSLoader";
-
-
-
-local screenWidth = 640;
-local screenHeight = 480;
-local rotateN = 0.0;
-local rotateFactor = 1;
-
-
-
-
-
---[[
-	Render
---]]
-local function renderbegin(scene, w, h)
-	local clearColor = ffi.new("VGfloat[4]", 1,1,1,1);
-	VG.vgSetfv(ffi.C.VG_CLEAR_COLOR, 4, clearColor);
-	VG.vgClear(0, 0, w, h);
-
-	VG.vgLoadIdentity();
-end
-
-local function renderend(scene, w, h)
-	mainWindow:SwapBuffers();	-- force EGL to recognize resize
-end
-
-local function render(scene, w, h)
-	local scale = w / (tigerModel.MaxX - tigerModel.MinX);
-
-	renderbegin(scene, w, h);
-
-
-        VG.vgTranslate(w * 0.5, h * 0.5);
-        VG.vgRotate(rotateN);
-        VG.vgTranslate(-w * 0.5, -h * 0.5);
-
-	VG.vgScale(scale, scale);
-	VG.vgTranslate(-tigerModel.MinX, -tigerModel.MinY + 0.5 * (h / scale - (tigerModel.MaxY - tigerModel.MinY)));
-
-	scene:render();
-	--assert(tonumber(VG.vgGetError()) == tonumber(ffi.C.VG_NO_ERROR));
-
-	renderend(scene, w, h);
-end
-
-
-
 
 
 OpenVGApp = {}
@@ -75,13 +26,16 @@ OpenVGApp.init = function(width, height)
 	width = width or 640;
 	height = height or 480;
 
+	-- Setup the event loop stuff
 	OpenVGApp.Loop = EventLoop.new(15);
 	OpenVGApp.Keyboard = Keyboard.new();
 
 
 	OpenVGApp.Loop:AddObservable(OpenVGApp.Keyboard);
 	OpenVGApp.Loop.OnIdle = OpenVGApp.Idle;
 	OpenVGApp.Keyboard.OnKeyUp = OpenVGApp.KeyUp;
+	
+	-- Create the Main Window
 	OpenVGApp.Window = EGL.Window.new(width, height, nil, EGL.EGL_OPENVG_API);
 
 	return OpenVGApp;

bcm_host.lua

@@ -1,4 +1,3 @@
-package.path = package.path..";interface/?.lua"
 
 local ffi = require "ffi"
 
@@ -11,9 +10,9 @@ int32_t graphics_get_display_size( const uint16_t display_number, uint32_t *widt
 
 require "libc"
 
-require "interface/vc_dispmanx"
-require "interface/vc_tvservice"
-require "interface/vcgencmd"
+require "vc_dispmanx"
+require "vc_tvservice"
+require "vcgencmd"
 
 --[[
 

test_bcm_host.lua

@@ -1,12 +0,0 @@
---package.path = package.path..";../?.lua"
-
-local ffi = require "ffi"
-
-
-local bcm = require "BcmHost"
-
-
-print(bcm.GetDisplaySize());
-
-
-

test_snapshot.lua

@@ -52,7 +52,7 @@ displayView:Show();
 local pixeldata, err = displayView.Resource:ReadPixelData();
 if pixeldata then
 	-- Write the data out
-	local filename = "desktop.ppm"
+	local filename = "~/desktop.ppm"
 	print("Writing: ", filename);
 
 	WritePPM(filename, pixeldata);

tests/snapper.lua

@@ -0,0 +1,60 @@
+
+local ffi = require "ffi"
+local DMX = require "DisplayManX"
+
+local Display = DMXDisplay();
+Display:SetBackground(0,0,0);
+
+local screenWidth, screenHeight = Display:GetSize();
+local ratio = screenWidth / screenHeight;
+
+local displayHeight = screenHeight;
+local displayWidth = screenWidth;
+--local displayHeight = 320;
+--local displayWidth = 640;
+--local displayHeight = 70;
+--local displayWidth = displayHeight * ratio;
+
+
+-- Create the view that will display the snapshot
+local displayView = Display:CreateView(
+	displayWidth, displayHeight, 
+	0, screenHeight-displayHeight-1,
+	0, ffi.C.VC_IMAGE_RGB888)
+
+
+local function WritePPM(filename, pixbuff)
+    local r, c, val;
+
+    local fp = io.open(filename, "wb")
+    if not fp then
+        return false
+    end
+
+    local header = string.format("P6\n%d %d\n255\n", pixbuff.Width, pixbuff.Height)
+    fp:write(header);
+
+    for row=0,pixbuff.Height-1 do
+	local dataPtr = ffi.cast("char *",pixbuff.Data) + pixbuff.Pitch*row
+    	local data = ffi.string(dataPtr, pixbuff.Width*3);
+    	fp:write(data);
+    end
+
+    fp:close();
+end
+
+
+-- Do the snapshot
+Display:Snapshot(displayView.Resource);
+
+
+local pixeldata, err = displayView.Resource:ReadPixelData();
+if pixeldata then
+	-- Write the data out
+	local filename = "media/desktop.ppm"
+--	print("Writing: ", filename);
+
+	WritePPM(filename, pixeldata);
+end
+
+	

test_tiger.lua → tests/test_tiger.lua

@@ -1,3 +1,4 @@
+package.path = package.path..";../?.lua"
 
 local ffi = require "ffi"
 local C = ffi.C;