Changeset 368 for trunk/src

Timestamp:

05/22/15 10:28:08 (10 years ago)

Author:

epyon

Message:

• massive restructuring
• detail::data_base class for container/reference class base

Location:

trunk/src

Files:

• core/logger.cc (modified) (8 diffs)
• engine/program_manager.cc (modified) (1 diff)
• engine/resource_system.cc (modified) (1 diff)
• formats/nmd_loader.cc (modified) (1 diff)
• lib/gl.cc (modified) (1 diff)
• lua/lua_area.cc (modified) (1 diff)
• lua/lua_flags.cc (modified) (1 diff)
• lua/lua_glm.cc (modified) (1 diff)
• lua/lua_map_area.cc (modified) (1 diff)
• lua/lua_map_tile.cc (modified) (1 diff)
• lua/lua_raw.cc (modified) (1 diff)
• lua/lua_state.cc (modified) (1 diff)
• rogue/fov_recursive_shadowcasting.cc (modified) (1 diff)
• sdl/sdl_audio.cc (modified) (1 diff)
• stl (added)
• stl/string.cc (moved) (moved from trunk/src/core/string.cc) (1 diff)

trunk/src/core/logger.cc

@@ -142 +142 @@
 void log_console_sink::log( log_level level, const string_ref& message )
 {
+        char stamp[16];
+        size_t ssize = timestamp( stamp );
+
 #if NV_PLATFORM == NV_WINDOWS 
         if ( m_color ) SetConsoleTextAttribute( m_handle, FOREGROUND_INTENSITY );
-        string_ref stamp( timestamp() );
-        WriteConsole( m_handle, stamp.data(), stamp.size(), nullptr, nullptr );
+        WriteConsole( m_handle, stamp, ssize, nullptr, nullptr );
         WriteConsole( m_handle, " [", 2, nullptr, nullptr );
         if (m_color) SetConsoleTextAttribute( m_handle, log_color[( level ) / 10] );
@@ -156 +158 @@
 #else
         if ( m_color ) fwrite( "\33[30;1m", 7, 1, stdout );
-        fwrite( stamp.data(), stamp.size(), 1, stdout );
+        fwrite( stamp, ssize, 1, stdout );
         fwrite( " [", 2, 1, stdout );
         if ( m_color )
@@ -176 +178 @@
 void log_handle_sink::log( log_level level, const string_ref& message )
 {
-        string_ref stamp( timestamp() );
+        char stamp[16];
+        size_t ssize = timestamp( stamp );
 #if 0 // NV_PLATFORM == NV_WINDOWS
         // Turns out WriteFile on Windows is unbuffered and quite slower than fwrite 
@@ -182 +185 @@
         // If we want to get rid of C runtime, this would need a buffered I/O layer.
         DWORD unused = 0;
-        WriteFile( m_handle, stamp.data(), stamp.size(), &unused, nullptr );
+        WriteFile( m_handle, stamp, ssize, &unused, nullptr );
         WriteFile( m_handle, " [", 2, &unused, nullptr );
         WriteFile( m_handle, NV_LOG_LEVEL_NAME_PAD( level ), 8, &unused, nullptr );
@@ -190 +193 @@
         //if ( m_flush ) FlushFileBuffers( m_handle );
 #else
-        fwrite( stamp.data(), stamp.size(), 1, (FILE*)m_handle );
+        fwrite( stamp, ssize, 1, (FILE*)m_handle );
         fwrite( " [", 2, 1, (FILE*)m_handle );
         fwrite( NV_LOG_LEVEL_NAME_PAD( level ), 8, 1, (FILE*)m_handle );
@@ -237 +240 @@
 }
 
-string_ref nv::log_sink::timestamp() const
+size_t nv::log_sink::timestamp( char* buffer ) const
 {
         uint32 ms = get_system_ms();
@@ -245 +248 @@
         unsigned int m    = (unsigned int)(secs / 60) % 60;
         unsigned int s    = secs % 60;
-        static char buffer[16];
 #if NV_PLATFORM == NV_WINDOWS 
         sprintf_s( buffer, 16, "%02d:%02d:%02d.%02d", h, m, s, mm );
@@ -251 +253 @@
         snprintf( buffer, 16, "%02d:%02d:%02d.%02d", h, m, s, mm );
 #endif
-        buffer[11] = '\0';
-        return string_ref( buffer, 10 );
+        return 11;
 }
 

trunk/src/engine/program_manager.cc

@@ -6 +6 @@
 
 #include "nv/engine/program_manager.hh"
-#include "nv/core/range.hh"
+#include "nv/stl/range.hh"
 #include "nv/core/logging.hh"
 #include "nv/lua/lua_nova.hh"

trunk/src/engine/resource_system.cc

@@ -6 +6 @@
 
 #include "nv/engine/resource_system.hh"
-#include "nv/core/range.hh"
+#include "nv/stl/range.hh"
 #include "nv/lua/lua_nova.hh"
 

trunk/src/formats/nmd_loader.cc

@@ -7 +7 @@
 #include "nv/formats/nmd_loader.hh"
 #include "nv/io/std_stream.hh"
-#include "nv/core/string.hh"
+#include "nv/stl/string.hh"
 
 using namespace nv;

trunk/src/lib/gl.cc

@@ -6 +6 @@
 
 #include "nv/core/common.hh"
-#include "nv/core/range.hh"
+#include "nv/stl/range.hh"
 #include "nv/core/logging.hh"
 #include "nv/lib/gl.hh"

trunk/src/lua/lua_area.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
-#include "nv/core/string.hh"
+#include "nv/stl/string.hh"
 #include "nv/core/random.hh"
 

trunk/src/lua/lua_flags.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
-#include "nv/core/string.hh"
+#include "nv/stl/string.hh"
 
 

trunk/src/lua/lua_glm.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
-#include "nv/core/string.hh"
+#include "nv/stl/string.hh"
 #include "nv/core/random.hh"
 

trunk/src/lua/lua_map_area.cc

@@ -6 +6 @@
 
 #include "nv/lua/lua_map_area.hh"
-#include "nv/core/flags.hh"
+#include "nv/stl/flags.hh"
 #include "nv/lua/lua_area.hh"
 #include "nv/lua/lua_glm.hh"

trunk/src/lua/lua_map_tile.cc

@@ -9 +9 @@
 #include <numeric>
 #include "nv/lua/lua_map_area.hh"
-#include "nv/core/flags.hh"
+#include "nv/stl/flags.hh"
 #include "nv/core/random.hh"
 #include "nv/lua/lua_area.hh"

trunk/src/lua/lua_raw.cc

@@ -7 +7 @@
 #include "nv/lua/lua_raw.hh"
 
-#include "nv/core/string.hh"
+#include "nv/stl/string.hh"
 
 std::string nlua_typecontent( lua_State* L, int idx )

trunk/src/lua/lua_state.cc

@@ -10 +10 @@
 #include "nv/lua/lua_nova.hh"
 #include "nv/core/logging.hh"
-#include "nv/core/string.hh"
+#include "nv/stl/string.hh"
 
 using namespace nv;

trunk/src/rogue/fov_recursive_shadowcasting.cc

@@ -7 +7 @@
 #include "nv/rogue/fov_recursive_shadowcasting.hh"
 
-#include "nv/core/math.hh"
+#include "nv/stl/math.hh"
 
 static int nv_rogue_rs_mult[4][8] = {

trunk/src/sdl/sdl_audio.cc

@@ -7 +7 @@
 #include "nv/sdl/sdl_audio.hh"
 
-#include "nv/core/math.hh"
+#include "nv/stl/math.hh"
 #include "nv/lib/sdl_mixer.hh"
 #include "nv/core/logging.hh"

trunk/src/stl/string.cc

@@ -7 +7 @@
 // TODO: speedup conversion by doing divisions by 100
 
-#include "nv/core/string.hh"
+#include "nv/stl/string.hh"
 
 #include <cstdio>