Changeset 99

Timestamp:

Feb 14, 2007, 4:36:09 AM (17 years ago)

Author:

NoWest

Message:

 

File:

• Include/abgl.ab (modified) (9 diffs)

Include/abgl.ab

@@ -607 +607 @@
 
 Public /* static method */
-    Static Function FromRGB(r As GLbyte, g As GLbyte, b As GLbyte) As Color3f
-        Dim ret As Color3f(r/255,g/255,b/255)
+    Static Function FromRGB(r As GLubyte, g As GLubyte, b As GLubyte) As Color3f
+        Dim ret As Color3f((r As GLfloat)/255.0 As GLfloat,(g As GLfloat)/255.0 As GLfloat,(b As GLfloat)/255.0 As GLfloat)
         Return ret
     End Function
     Static Function FromCOLORREF(c As COLORREF) As Color3f
-        Dim ret As Color3f((c and &hff)/255,(c>>8 and &hff)/255,(c>>16 and &hff)/255)
+        Dim ret As Color3f((c and &hff) As GLfloat/255,(c>>8 and &hff) As GLfloat/255,(c>>16 and &hff) As GLfloat/255)
         Return ret
     End Function
@@ -725 +725 @@
 
 Public /* static method */
-    Static Function FromRGB(r As GLbyte, g As GLbyte, b As GLbyte) As Color3d
+    Static Function FromRGB(r As GLubyte, g As GLubyte, b As GLubyte) As Color3d
         Dim ret As Color3d(r/255,g/255,b/255)
         Return ret
@@ -871 +871 @@
 
 Public /* static method */
-    Static Function FromRGB(r As GLbyte, g As GLbyte, b As GLbyte) As Color4f
+    Static Function FromRGB(r As GLubyte, g As GLubyte, b As GLubyte) As Color4f
         Dim ret As Color4f(r/255,g/255,b/255,1.0)
         Return ret
@@ -1006 +1006 @@
 
 Public /* static method */
-    Static Function FromRGB(r As GLbyte, g As GLbyte, b As GLbyte) As Color4d
+    Static Function FromRGB(r As GLubyte, g As GLubyte, b As GLubyte) As Color4d
         Dim ret As Color4d(r/255,g/255,b/255,1.0)
         Return ret
@@ -1061 +1061 @@
 
 
-
 Class Light
 Private
@@ -1068 +1067 @@
 Public
     Sub Enabled(enabled As GLboolean)
+        If enabled Then
+            glEnable(Number)
+        Else
+            glDisable(Number)
+        End If
+    End Sub
+    Function Enabled() As GLboolean
         Dim lighting As GLboolean
         glGetBooleanv(Number,VarPtr(lighting))
         Return lighting
-    End Sub
-    Function Enable() As GLboolean
-        If enabled Then
-            glEnable(Number)
-        Else
-            glDisable(Number)
-        End If
     End Function
 
@@ -1414 +1413 @@
 End Class
 
-Class RenderState
+Class RenderStateManager
 Public /* Composiotion */
     LightModel As LightModel
@@ -1570 +1569 @@
     End Sub
 
-    Function FogColor() As *GLfloat
-        glGetFloatv(GL_FOG_COLOR,FogColor)
-        Return FogColor
-    End Function
-    Sub FogColor(fcolor As *GLfloat)
-        glFogfv(GL_FOG_COLOR,fcolor)
+    Function FogColor() As Color4f
+        Dim ret As Color4f
+        glGetFloatv(GL_FOG_COLOR,VarPtr(ret.rgba))
+        Return ret
+    End Function
+    Sub FogColor(fcolor As Color4f)
+        glFogfv(GL_FOG_COLOR,VarPtr(fcolor.rgba))
     End Sub
 
@@ -1735 +1735 @@
 Public /* Composiotion */
     Material As Material
-    RenderState As RenderState
+    RenderState As RenderStateManager
     Transform As Transform
     Lights[ELM(8)] As Light