Changeset 2257Tweet

Timestamp:

Jan 22, 2013, 1:48:51 AM (10 years ago)

Author:

sam

Message:

core: move the Log and Timer classes to the sys/ subdirectory, use
the String class instead of the stack for logging, and get rid of
the old and useless BitField class.

Location:

trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• bitfield.h (deleted)
• core.h (modified) (1 diff)
• lol/sys/log.h (moved) (moved from trunk/src/log.h) (3 diffs)
• lol/sys/timer.h (moved) (moved from trunk/src/timer.h) (3 diffs)
• lolcore.vcxproj (modified) (5 diffs)
• lolcore.vcxproj.filters (modified) (3 diffs)
• sys/log.cpp (moved) (moved from trunk/src/log.cpp) (2 diffs)
• sys/timer.cpp (moved) (moved from trunk/src/timer.cpp)

trunk/src/Makefile.am

@@ -10 +10 @@
     audio.cpp audio.h scene.cpp scene.h font.cpp font.h layer.cpp layer.h \
     map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h lolgl.h \
-    tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h log.cpp log.h \
-    timer.cpp timer.h bitfield.h profiler.cpp profiler.h \
+    tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h \
     world.cpp world.h sample.cpp sample.h sampler.cpp sampler.h \
-    text.cpp text.h emitter.cpp emitter.h numeric.h \
+    profiler.cpp profiler.h text.cpp text.h emitter.cpp emitter.h numeric.h \
     worldentity.cpp worldentity.h gradient.cpp gradient.h gradient.lolfx \
     platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
     \
-    lol/unit.h lol/debug.h \
     lol/base/types.h lol/base/array.h lol/base/string.h lol/base/hash.h \
     lol/base/map.h \
     lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
-    lol/math/math.h \
-    lol/math/geometry.h \
-    lol/sys/init.h \
+    lol/math/math.h lol/math/geometry.h \
+    lol/sys/init.h lol/sys/log.h lol/sys/thread.h lol/sys/timer.h \
     lol/image/color.h \
+    lol/unit.h lol/debug.h \
     \
     generated/location.hh generated/position.hh generated/stack.hh \
@@ -72 +70 @@
     mesh/mesh.cpp mesh/mesh.h \
     \
-    sys/init.cpp \
-    sys/threadbase.h sys/thread.h \
+    sys/init.cpp sys/log.cpp sys/timer.cpp \
+    sys/threadbase.h \
     \
     image/image.cpp image/image.h image/image-private.h \

trunk/src/core.h

@@ -90 +90 @@
 
 #include <lol/sys/init.h>
+#include <lol/sys/log.h>
 #include <lol/sys/thread.h>
+#include <lol/sys/timer.h>
 
 #include <lol/image/color.h>
 
 #include "numeric.h"
-#include "timer.h"
 
 // Static classes
-#include "log.h"
 #include "platform.h"
 #include "video.h"

trunk/src/lol/sys/log.h

@@ -2 +2 @@
 // Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
 //   This program is free software; you can redistribute it and/or
 //   modify it under the terms of the Do What The Fuck You Want To
@@ -15 +15 @@
 //
 
-#if !defined __LOL_LOG_H__
-#define __LOL_LOG_H__
+#if !defined __LOL_SYS_LOG_H__
+#define __LOL_SYS_LOG_H__
 
 #include <stdint.h>
@@ -52 +52 @@
 } /* namespace lol */
 
-#endif // __LOL_LOG_H__
+#endif // __LOL_SYS_LOG_H__
 

trunk/src/lol/sys/timer.h

@@ -2 +2 @@
 // Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
 //   This program is free software; you can redistribute it and/or
 //   modify it under the terms of the Do What The Fuck You Want To
@@ -14 +14 @@
 //
 
-#if !defined __LOL_TIMER_H__
-#define __LOL_TIMER_H__
+#if !defined __LOL_SYS_TIMER_H__
+#define __LOL_SYS_TIMER_H__
 
 namespace lol
@@ -38 +38 @@
 } /* namespace lol */
 
-#endif // __LOL_TIMER_H__
+#endif // __LOL_SYS_TIMER_H__
 

trunk/src/lolcore.vcxproj

@@ -273 +273 @@
     <ClCompile Include="input\stick.cpp" />
     <ClCompile Include="layer.cpp" />
-    <ClCompile Include="log.cpp" />
     <ClCompile Include="map.cpp" />
     <ClCompile Include="math\geometry.cpp" />
@@ -295 +294 @@
     <ClCompile Include="sprite.cpp" />
     <ClCompile Include="sys\init.cpp" />
+    <ClCompile Include="sys\log.cpp" />
+    <ClCompile Include="sys\timer.cpp" />
     <ClCompile Include="text.cpp" />
     <ClCompile Include="ticker.cpp" />
@@ -307 +308 @@
     <ClInclude Include="application\application.h" />
     <ClInclude Include="audio.h" />
-    <ClInclude Include="bitfield.h" />
     <ClInclude Include="bullet\btBulletCollisionCommon.h" />
     <ClInclude Include="bullet\btBulletDynamicsCommon.h" />
@@ -585 +585 @@
     <ClInclude Include="input\stick.h" />
     <ClInclude Include="layer.h" />
-    <ClInclude Include="log.h" />
     <ClInclude Include="loldebug.h" />
     <ClInclude Include="lolgl.h" />
@@ -602 +601 @@
     <ClInclude Include="lol\math\vector.h" />
     <ClInclude Include="lol\sys\init.h" />
+    <ClInclude Include="lol\sys\log.h" />
     <ClInclude Include="lol\sys\thread.h" />
+    <ClInclude Include="lol\sys\timer.h" />
     <ClInclude Include="lol\unit.h" />
     <ClInclude Include="mesh\mesh.h" />

trunk/src/lolcore.vcxproj.filters

@@ -193 +193 @@
       <Filter>...</Filter>
     </ClCompile>
-    <ClCompile Include="log.cpp">
-      <Filter>...</Filter>
-    </ClCompile>
     <ClCompile Include="map.cpp">
       <Filter>...</Filter>
@@ -753 +750 @@
       <Filter>...</Filter>
     </ClInclude>
-    <ClInclude Include="bitfield.h">
-      <Filter>...</Filter>
-    </ClInclude>
     <ClInclude Include="camera.h">
       <Filter>...</Filter>
@@ -784 +778 @@
     </ClInclude>
     <ClInclude Include="layer.h">
-      <Filter>...</Filter>
-    </ClInclude>
-    <ClInclude Include="log.h">
       <Filter>...</Filter>
     </ClInclude>

trunk/src/sys/log.cpp

@@ -83 +83 @@
     };
 
-    char buf[4096];
-    vsnprintf(buf, 4095, fmt, ap);
-    buf[4095] = '\0';
-
-    __android_log_print(prio[type], "LOL", "[%d] %s", (int)gettid(), buf);
+    String buf = String::Printf(fmt, ap);
+    __android_log_print(prio[type], "LOL", "[%d] %s", (int)gettid(), &buf[0]);
 
 #else
@@ -99 +96 @@
 
 #   if defined _WIN32
-    char buf[4096];
-    vsnprintf(buf, 4095, fmt, ap);
-    buf[4095] = '\0';
-    OutputDebugString(prefix[type]);
-    OutputDebugString(": ");
-    OutputDebugString(buf);
+    String buf = String(prefix[type]) + ": " + String::Printf(fmt, ap);
+    OutputDebugString(&buf[0]);
 #   else
     fprintf(stderr, "%s: ", prefix[type]);