Changeset 498 for trunk/src

Timestamp:

06/03/16 16:24:49 (9 years ago)

Author:

epyon

Message:

• ecs implementation
• mipmapping by default for material manager
• minor fixes

Location:

trunk/src

Files:

• engine/material_manager.cc (modified) (1 diff)
• gl/gl_device.cc (modified) (2 diffs)

trunk/src/engine/material_manager.cc

@@ -28 +28 @@
         {
                 gpu_material* result = new gpu_material;
-                sampler smp( sampler::LINEAR, sampler::REPEAT );
+                sampler smp( sampler::LINEAR_MIPMAP_LINEAR, sampler::REPEAT );
                 for ( uint32 i = 0; i < size( mat->paths ); ++i )
                         if ( !mat->paths[i].empty() )

trunk/src/gl/gl_device.cc

@@ -109 +109 @@
 
         // Detect if mipmapping was requested
-        if ( gl_type == GL_TEXTURE_2D && gl_enum != GL_RED_INTEGER && asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST )
-        {
-                // TODO: This should not be done if we use framebuffers!
-                glTexParameteri( gl_type, GL_GENERATE_MIPMAP, GL_TRUE);
-        }
+//      if ( gl_type == GL_TEXTURE_2D && gl_enum != GL_RED_INTEGER && asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST )
+//      {
+//              // TODO: This should not be done if we use framebuffers!
+//              glTexParameteri( gl_type, GL_GENERATE_MIPMAP, GL_TRUE);
+//      }
 
         if ( asampler.filter_max != sampler::NEAREST )
@@ -154 +154 @@
         else
                 glTexImage2DMultisample( gl_type, 4, gl_internal, size.x, size.y, 1 );
+
+        if ( gl_type == GL_TEXTURE_2D && gl_enum != GL_RED_INTEGER && asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST )
+        {
+                // TODO: This should not be done if we use framebuffers!
+                glGenerateMipmap( gl_type );
+        }
+
 
         glBindTexture( gl_type, 0 );