Changeset 550 for trunk/src

Timestamp:

03/09/17 13:33:03 (8 years ago)

Author:

epyon

Message:

• ECS and windowing updates

Location:

trunk/src

Files:

• gfx/texture_font.cc (modified) (2 diffs)
• gl/gl_context.cc (modified) (3 diffs)
• sdl/sdl_window.cc (modified) (2 diffs)
• sdl/sdl_window_manager.cc (modified) (1 diff)

trunk/src/gfx/texture_font.cc

@@ -111 +111 @@
         else
         {
-                flags |= FT_LOAD_FORCE_AUTOHINT;
+                //flags |= FT_LOAD_FORCE_AUTOHINT;
         } 
 
@@ -122 +122 @@
                         FT_Library_SetLcdFilterWeights( reinterpret_cast<FT_Library>( m_rlibrary ), m_lcd_weights );
                 }
+
         } 
 

trunk/src/gl/gl_context.cc

@@ -47 +47 @@
                         static_cast<GLint>( vba.components ),
                         nv::datatype_to_gl_enum( vba.dtype ),
-                        GL_FALSE,
+                        vba.interpolate ? GL_TRUE : GL_FALSE,
                         static_cast<GLsizei>( vba.stride ),
                         reinterpret_cast<void*>( vba.offset )
@@ -693 +693 @@
         if ( m_render_state.multisample != multisample )
         {
-                glDepthMask( multisample );
+                enable( GL_MULTISAMPLE, multisample );
                 m_render_state.multisample = multisample;
         }
@@ -891 +891 @@
         m_active_slot = texture_slot( -1 );
         force_apply_render_state( m_render_state );
+        glHint( GL_POLYGON_SMOOTH_HINT, GL_NICEST );
 }
 

trunk/src/sdl/sdl_window.cc

@@ -15 +15 @@
 using namespace nv;
 
-sdl::window::window( device* dev, uint16 width, uint16 height, bool fullscreen )
+sdl::window::window( device* dev, uint16 width, uint16 height, bool fullscreen, bool msaa )
         : m_device( dev ), m_width( width ), m_height( height ), m_title("Nova Engine"), m_handle( nullptr )
 {
@@ -27 +27 @@
         SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
 
-        //      SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
-        //      SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, 4 );
+        if ( msaa )
+        {
+                SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, 1 );
+                SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, 4 );
+        }
 
         SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);

trunk/src/sdl/sdl_window_manager.cc

@@ -27 +27 @@
 }
 
-window* sdl::window_manager::create_window( device* dev, uint16 width, uint16 height, bool fullscreen )
+window* sdl::window_manager::create_window( device* dev, uint16 width, uint16 height, bool fullscreen, bool msaa )
 {
         if ( ! SDL_WasInit( SDL_INIT_VIDEO ) ) SDL_InitSubSystem( SDL_INIT_VIDEO );
-        sdl::window* result = new sdl::window( dev, width, height, fullscreen );
+        sdl::window* result = new sdl::window( dev, width, height, fullscreen, msaa );
         primal_window = result->get_handle();
         return result;