Changeset 322 for trunk/src

Timestamp:

08/25/14 04:27:26 (11 years ago)

Author:

epyon

Message:

• profiler control via define/NV_DEBUG
• weird RELEASE mode audio error - need to investigate
• fixed - render_state in RELEASE mode would not set depth_mask!

Location:

trunk/src

Files:

• gui/gui_renderer.cc (modified) (4 diffs)
• sdl/sdl_audio.cc (modified) (1 diff)

trunk/src/gui/gui_renderer.cc

@@ -11 +11 @@
 #include "nv/interface/device.hh"
 #include "nv/interface/context.hh"
+#include "nv/core/logging.hh"
 
 static const char *nv_gui_vertex_shader =
@@ -123 +124 @@
         , m_reupload( true )
 {
+        NV_LOG( LOG_TRACE, "Creating GUI renderer..." );
         m_context = w->get_context();
         m_area.dim( dimension( w->get_width(), w->get_height() ) );
@@ -133 +135 @@
         delete[] wfill;
 
+        NV_LOG( LOG_TRACE, "Creating render data..." );
         screen_render_data* sr = new screen_render_data( w->get_context(), 1024 );
         m_render_data = sr;
@@ -152 +155 @@
         m_render_state.blending.src_alpha_factor = blending::SRC_ALPHA;
         m_render_state.blending.dst_alpha_factor = blending::ONE_MINUS_SRC_ALPHA;
+        NV_LOG( LOG_TRACE, "GUI Renderer created" );
 }
 

trunk/src/sdl/sdl_audio.cc

@@ -43 +43 @@
 nv::sound* nv::sdl::audio::load_sound( const std::string& a_path )
 {
-        Mix_Chunk *sample = Mix_LoadWAV( a_path.c_str() );
+        // TODO: this is a really wierd error - if we remove this check, all hell gets loose
+        if ( Mix_LoadWAV_RW == nullptr || SDL_RWFromFile == nullptr ) 
+        {
+                NV_LOG( LOG_ERROR, "SDL_mixer not loaded!" );
+        }
+        Mix_Chunk *sample = Mix_LoadWAV_RW(SDL_RWFromFile(a_path.c_str(), "rb"), 1);
         if ( sample == nullptr )
         {