Changeset 2097Tweet

Timestamp:

Nov 20, 2012, 1:23:15 AM (11 years ago)

Author:

sam

Message:

core: refactor the Hash class so that we can hash base types, too.

Location:

trunk/src

Files:

• Makefile.am (modified) (3 diffs)
• core (added)
• core.h (modified) (2 diffs)
• core/hash.cpp (added)
• gpu/shader.cpp (modified) (4 diffs)
• hash.cpp (deleted)
• hash.h (deleted)
• lol/core/hash.h (added)
• lolcore.vcxproj (modified) (4 diffs)

trunk/src/Makefile.am

@@ -7 +7 @@
 
 liblol_a_SOURCES = \
-    core.h tiler.cpp tiler.h dict.cpp dict.h array.h \
+    core.h tiler.cpp tiler.h dict.cpp dict.h \
     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 \
@@ -13 +13 @@
     timer.cpp timer.h bitfield.h profiler.cpp profiler.h \
     world.cpp world.h sample.cpp sample.h sampler.cpp sampler.h \
-    text.cpp text.h emitter.cpp emitter.h numeric.h hash.cpp hash.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/core/array.h lol/core/string.h \
+    lol/core/array.h lol/core/string.h lol/core/hash.h \
     lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
     lol/math/math.h \
@@ -40 +40 @@
     $(android_sources) \
     $(bullet_sources) \
+    \
+    core/hash.cpp \
     \
     thread/threadbase.h thread/thread.h \

trunk/src/core.h

@@ -78 +78 @@
 #include <lol/core/array.h>
 #include <lol/core/string.h>
+#include <lol/core/hash.h>
 #include <lol/math/math.h>
 #include <lol/math/half.h>
@@ -112 +113 @@
 
 // Other objects
-#include "hash.h"
 #include "dict.h"
 #include "map.h"

trunk/src/gpu/shader.cpp

@@ -72 +72 @@
     /* Global shader cache */
     static Shader *shaders[];
+    static Hash<char const *> hash;
     static int nshaders;
 };
 
 Shader *ShaderData::shaders[256];
+Hash<char const *> ShaderData::hash;
 int ShaderData::nshaders = 0;
 
@@ -138 +140 @@
         Log::Error("no fragment shader found… sorry, I’m gonna crash now.\n");
 
-    uint32_t new_vert_crc = Hash::Crc32(vert);
-    uint32_t new_frag_crc = Hash::Crc32(frag);
+    uint32_t new_vert_crc = ShaderData::hash(vert);
+    uint32_t new_frag_crc = ShaderData::hash(frag);
 
     for (int n = 0; n < ShaderData::nshaders; n++)
@@ -190 +192 @@
 
     /* Compile vertex shader */
-    data->vert_crc = Hash::Crc32(vert);
+    data->vert_crc = ShaderData::hash(vert);
 #if defined USE_D3D9 || defined _XBOX
     hr = D3DXCompileShader(vert, (UINT)strlen(vert), macros, NULL, "main",
@@ -234 +236 @@
 
     /* Compile fragment shader */
-    data->frag_crc = Hash::Crc32(frag);
+    data->frag_crc = ShaderData::hash(frag);
 #if defined USE_D3D9 || defined _XBOX
     hr = D3DXCompileShader(frag, (UINT)strlen(frag), macros, NULL, "main",

trunk/src/lolcore.vcxproj

@@ -235 +235 @@
     <ClCompile Include="bullet\LinearMath\btSerializer.cpp" />
     <ClCompile Include="camera.cpp" />
+    <ClCompile Include="core\hash.cpp" />
     <ClCompile Include="debug\fps.cpp" />
     <ClCompile Include="debug\record.cpp" />
@@ -258 +259 @@
     <ClCompile Include="gpu\vertexbuffer.cpp" />
     <ClCompile Include="gradient.cpp" />
-    <ClCompile Include="hash.cpp" />
     <ClCompile Include="image\codec\android-image.cpp" />
     <ClCompile Include="image\codec\dummy-image.cpp" />
@@ -573 +573 @@
     <ClInclude Include="gpu\vertexbuffer.h" />
     <ClInclude Include="gradient.h" />
-    <ClInclude Include="hash.h" />
     <ClInclude Include="image\image-private.h" />
     <ClInclude Include="image\image.h" />
@@ -584 +583 @@
     <ClInclude Include="lolgl.h" />
     <ClInclude Include="lol\core\array.h" />
+    <ClInclude Include="lol\core\hash.h" />
+    <ClInclude Include="lol\core\string.h" />
     <ClInclude Include="lol\debug.h" />
     <ClInclude Include="lol\math\half.h" />