*** empty log message ***

5 files changed, 66 insertions, 8 deletions

diff --git a/glflag/.cvsignore b/glflag/.cvsignore
new file mode 100644
index 0000000..795866f
--- /dev/null
+++ b/glflag/.cvsignore
@@ -0,0 +1,3 @@
+.bmx

+test.exe

+test.debug.exe
\ No newline at end of file
diff --git a/glflag/earth.png b/glflag/earth.png
new file mode 100644
index 0000000..6abc6fe
--- /dev/null
+++ b/glflag/earth.png
diff --git a/glflag/test.bmx b/glflag/test.bmx
new file mode 100644
index 0000000..24aa3ba
--- /dev/null
+++ b/glflag/test.bmx
@@ -0,0 +1,51 @@
+' $Id$
+
+Import noddybox.glflag
+
+Const SCRW=800
+Const SCRH=600
+
+bglCreateContext(SCRW,SCRH,32,0,BGL_BACKBUFFER|BGL_DEPTHBUFFER|BGL_FULLSCREEN)
+glewInit()
+
+tid1=bglTexFromPixmap(LoadPixmap("earth.png"))
+tid2=bglTexFromPixmap(LoadPixmap("tile.png"))
+
+If tid1=0 Or tid2=0
+	RuntimeError "Failed to open textures"
+EndIf
+
+glClearColor(0.0, 0.0, 0.0, 1.0)
+glMatrixMode(GL_PROJECTION)
+glLoadIdentity()
+gluPerspective(45.0, SCRW/SCRH, 10, 10000)
+
+glEnable(GL_DEPTH_TEST)
+glEnable(GL_TEXTURE_2D)
+glEnable(GL_CULL_FACE)
+glDisable(GL_LIGHTING)
+
+glMatrixMode(GL_MODELVIEW)
+
+cells=50
+size=1
+
+'f:GLFlag=GLFlag.Create(tid1,cells,cells,size,False,-200)
+f:GLFlag=GLFlag.Create(tid2,cells,cells,size,True,-200)
+
+c=0
+
+While Not KeyDown(KEY_ESCAPE)
+	c:+1
+	
+	If (c=100)
+		f.Nudge(Rand(0,cells-1),Rand(0,cells-1),Rnd(),Rnd(),Rnd())
+		c=0
+	EndIf
+	
+	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT)
+	glLoadIdentity()
+	f.Render(0.9,0.95)
+	bglSwapBuffers
+	FlushMem
+Wend 
diff --git a/glflag/tile.png b/glflag/tile.png
new file mode 100644
index 0000000..a68eec4
--- /dev/null
+++ b/glflag/tile.png
diff --git a/imagefont/test.bmx b/imagefont/test.bmx
index c587247..29095c4 100644
--- a/imagefont/test.bmx
+++ b/imagefont/test.bmx
@@ -3,14 +3,14 @@
 Import noddybox.bitmapfont
 
 'Import "BitmapFont.bmx"
-Incbin "bmaxtest.bmf"
+Incbin "bmaxtest3.bmf"
 
 Const SCRW=640
 Const SCRH=480
 
-Graphics SCRW,SCRH,32,60
-
-fnt:BitmapFont=BitmapFont.Load("incbin::bmaxtest.bmf")
+SetGraphicsDriver GLMax2DDriver()
+Graphics SCRW,SCRH,32,60' Or HARDSYNC
+fnt:BitmapFont=BitmapFont.Load("incbin::bmaxtest3.bmf",0)
 
 If fnt=Null
 	RuntimeError "Failed to open font"
@@ -46,7 +46,9 @@ For f=0 Until NO
 	st[f]=Star.Create()
 Next
 
-While False ' Not KeyHit(KEY_ESCAPE)
+SetBlend(ALPHABLEND)
+
+While Not KeyHit(KEY_ESCAPE)
 	Cls
 
 	For f=0 Until NO
@@ -65,7 +67,7 @@ While False ' Not KeyHit(KEY_ESCAPE)
 		If (c=100 Or c=255) ci=-ci
 	EndIf
 	
-	DrawText(MemAlloced(),0,100)
+	fnt.DrawColoured(MemAlloced(),0,300,255,0,0)
 
 	If KeyHit(KEY_SPACE) Then FlushMem
 
@@ -73,7 +75,7 @@ While False ' Not KeyHit(KEY_ESCAPE)
 	
 Wend
 
-sc=20
+sc=10
 t$="THIS IS SOME VERY, VERY, *VERY* ~~LARGE SCROLLING TEXT....."
 x#=0
 ang#=0
@@ -88,8 +90,10 @@ While Not KeyHit(KEY_ESCAPE)
 	
 	SetTransform(0,1,1)
 
+	Rem
 	DrawText("x="+x+"  width="+(-fnt.TextWidth(t[0..1]))+"  mem="+MemAlloced(),0,100)
 	DrawText("t="+t,0,110)
+	EndRem
 	
 	SetTransform(ang,sc,sc)
 	
@@ -97,7 +101,7 @@ While Not KeyHit(KEY_ESCAPE)
 	
 	If ang<=-10 Or ang>=10 Then angi=-angi
 
-	fnt.DrawColoured(t$,x,200,255,128,128)
+	fnt.DrawColoured(t$,x,0,255,255,255)'128,128)
 	
 	If Not KeyDown(KEY_P)
 		x:-5