OSDN Git Service

Double check if we have mipmap ability
authorLatif Khalifa <latifer@streamgrid.net>
Tue, 28 Jun 2011 14:47:09 +0000 (14:47 +0000)
committerLatif Khalifa <latifer@streamgrid.net>
Tue, 28 Jun 2011 14:47:09 +0000 (14:47 +0000)
git-svn-id: https://radegast.googlecode.com/svn/trunk@912 f7a694da-4d33-11de-9ad6-1127a62b9fcd

Radegast/GUI/Rendering/Rendering.cs

index 2acab30..f5b1e10 100644 (file)
@@ -337,6 +337,19 @@ namespace Radegast
         {\r
             try\r
             {\r
+                // Double check if we have mipmap ability\r
+                if (hasMipmap)\r
+                {\r
+                    try\r
+                    {\r
+                        GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);\r
+                    }\r
+                    catch\r
+                    {\r
+                        Logger.DebugLog("Don't have glGenerateMipmap() after all");\r
+                        hasMipmap = false;\r
+                    }\r
+                }\r
                 GL.ShadeModel(ShadingModel.Smooth);\r
                 GL.ClearColor(0f, 0f, 0f, 0f);\r
 \r
@@ -858,11 +871,10 @@ namespace Radegast
                             GL.Color4(faceColor);\r
                         }\r
 \r
+                        GL.NormalPointer(NormalPointerType.Float, 0, data.Normals);\r
                         GL.TexCoordPointer(2, TexCoordPointerType.Float, 0, data.TexCoords);\r
                         GL.VertexPointer(3, VertexPointerType.Float, 0, data.Vertices);\r
-                        GL.NormalPointer(NormalPointerType.Float, 0, data.Normals);\r
                         GL.DrawElements(BeginMode.Triangles, data.Indices.Length, DrawElementsType.UnsignedShort, data.Indices);\r
-\r
                     }\r
 \r
                     // Pop the prim matrix\r