medfall

commit ada73b193e9ae5399a5c0516ba49de11fd012e95
parent 583dc311d029e9e39d41a29436fa21b3ec319a80
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Sun Aug 16 11:19:56 +0200

Remove int.h. Add intrinsics.h, which contains all kinds of helpers

Diffstat:
game.h
 | 
2
+-
heightmap.cc
 | 
2
+-
heightmap.h
 | 
2
+-
hm.cc
 | 
2
+-
int.h
 | 
16
----------------
main.cc
 | 
2
+-
pp.cc
 | 
2
+-
terrain_manager.cc
 | 
2
+-
terrain_manager.h
 | 
2
+-
work_queue.cc
 | 
6
+-----
work_queue.h
 | 
3
+--
11 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/game.h b/game.h
@@ -4,7 +4,7 @@
 #include <GLFW/glfw3.h>
 #include <glm/glm.hpp>
 
-#include "int.h"
+#include "intrinsics.h"
 #include "terrain_manager.h"
 #include "work_queue.h"
 
diff --git a/heightmap.cc b/heightmap.cc
@@ -7,7 +7,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
-#include "int.h"
+#include "intrinsics.h"
 #include "heightmap.h"
 #include "stb_image.h"
 #include "stb_perlin.h"
diff --git a/heightmap.h b/heightmap.h
@@ -6,7 +6,7 @@
 #include <OpenGL/gl3.h>
 #include <glm/glm.hpp>
 
-#include "int.h"
+#include "intrinsics.h"
 
 class Heightmap {
 private:
diff --git a/hm.cc b/hm.cc
@@ -9,7 +9,7 @@
 #include <glm/gtc/type_ptr.hpp>
 
 #include "game.h"
-#include "int.h"
+#include "intrinsics.h"
 #include "heightmap.h"
 #include "terrain_manager.h"
 #include "work_queue.h"
diff --git a/int.h b/int.h
@@ -1,16 +0,0 @@
-#ifndef _INT_H_
-#define _INT_H_
-
-#include <cstdint>
-
-typedef int8_t i8;
-typedef int16_t i16;
-typedef int32_t i32;
-typedef int64_t i64;
-
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-
-#endif // _INT_H_
diff --git a/main.cc b/main.cc
@@ -7,7 +7,7 @@
 #include <GLFW/glfw3.h>
 
 #include "game.h"
-#include "int.h"
+#include "intrinsics.h"
 #include "gl.h"
 
 #define GAME_LIBRARY_PATH "hm.so"
diff --git a/pp.cc b/pp.cc
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
-#include "int.h"
+#include "intrinsics.h"
 #include "stb_image.h"
 #include "stb_image_write.h"
 
diff --git a/terrain_manager.cc b/terrain_manager.cc
@@ -12,7 +12,7 @@
 
 #include <glm/glm.hpp>
 
-#include "int.h"
+#include "intrinsics.h"
 #include "heightmap.h"
 #include "terrain_manager.h"
 
diff --git a/terrain_manager.h b/terrain_manager.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <glm/glm.hpp>
 
-#include "int.h"
+#include "intrinsics.h"
 #include "heightmap.h"
 
 class TerrainManager {
diff --git a/work_queue.cc b/work_queue.cc
@@ -3,13 +3,9 @@
 // #include <semaphore.h>
 #include <dispatch/dispatch.h>
 
-#include "int.h"
+#include "intrinsics.h"
 #include "work_queue.h"
 
-// TODO: move me somewhere else
-#define assert( predicate ) { if( !( predicate ) ) { __builtin_trap(); } }
-#define array_count( x ) ( sizeof( x ) / sizeof( ( x )[ 0 ] ) )
-
 #define read_barrier() asm volatile ( "" ::: "memory" )
 #define write_barrier() asm volatile ( "" ::: "memory" )
 
diff --git a/work_queue.h b/work_queue.h
@@ -3,8 +3,7 @@
 
 // #include <semaphore.h>
 #include <dispatch/dispatch.h>
-
-#include "int.h"
+#include "intrinsics.h"
 
 #define WORK_QUEUE_CALLBACK( name ) void name( void * const data )
 typedef WORK_QUEUE_CALLBACK( WorkQueueCallback );