Checked in .osg support for the new osg::Geometry class.

src/osg/Geometry.cpp

@@ -2,6 +2,49 @@
 
 using namespace osg;
 
+static char* s_ArrayNames[] =
+{
+    "AttributeArray", // 0
+    "ByteArray",     // 1
+    "ShortArray",    // 2
+    "IntArray",      // 3
+
+    "UByteArray",    // 4
+    "UShortArray",   // 5
+    "UIntArray",     // 6
+    "UByte4Array",   // 7
+
+    "FloatArray",    // 8
+    "Vec2Array",     // 9
+    "Vec3Array",     // 10
+    "Vec4Array",      // 11
+};
+
+const char* AttributeArray::className() const
+{
+    if (_arrayType>=AttributeArrayType && _arrayType<=Vec4ArrayType)
+        return s_ArrayNames[_arrayType];
+    else
+        return "UnkownAttributeArray";
+}
+
+static char* s_PrimitiveNames[] =
+{
+    "Primitive",                // 0
+    "DrawArrays",                // 1
+    "UByteDrawElements",        // 2
+    "UShortDrawElements",       // 3
+    "UIntDrawElements"          // 4
+};
+
+const char* Primitive::className() const
+{
+    if (_primitiveType>=PrimitivePrimitiveType && _primitiveType<=UIntDrawElementsPrimitiveType)
+        return s_PrimitiveNames[_primitiveType];
+    else
+        return "UnkownAttributeArray";
+}
+
 Geometry::Geometry()
 {
     _normalBinding = BIND_OFF;

src/osg/Texture.cpp

@@ -426,9 +426,7 @@ void Texture::applyTexImage(GLenum target, Image* image, State& state) const
     // when use 16 bit textures rather than 24/32bit textures.
     // internalFormat = GL_RGBA4;
     
-    // an experiment to look at the changes in performance
-    // when use 16 bit textures rather than 24/32bit textures.
-    // internalFormat = GL_RGBA4;
+
     static MyCompressedTexImage2DArbProc glCompressedTexImage2D_ptr = 
         (MyCompressedTexImage2DArbProc)getGLExtensionFuncPtr("glCompressedTexImage2DARB");