More documentation and bug fixes

gb.hpp

@@ -20,8 +20,8 @@ CONTENTS:
 	- C++11 Move Semantics
 	- Defer
 	- Casts
-		- pseudo_cast
 		- bit_cast
+		- pseudo_cast
 	- Memory
 		- Mutex
 		- Atomics
@@ -254,8 +254,14 @@ CONTENTS:
 				va_end(args);
 			}
 			fprintf(stderr, "\n");
-			// TODO(bill): Get a better way to abort
+
-			*(int*)0 = 0;
+		#if defined(GB_COMPILER_MSVC)
+			__debugbreak();
+		#elif defined(GB_COMPILER_GNU_GCC)
+			__builtin_trap();
+		#else
+			#error Implement aborting function
+		#endif
 		}
 
 	#else
@@ -673,7 +679,57 @@ __GB_NAMESPACE_START
 		u8 arr[4] = {0x78, 0x56, 0x34, 0x12};
 		u32 var = bit_cast<u32>(arr); // Little edian => 0x12345678
 
-		// TODO(bill): write pseudo_cast example
+		// pseudo_cast - except from gb_math.hpp
+		Sphere
+		calculate_min_bounding(const void* vertices, usize num_vertices, usize stride, usize offset, f32 step)
+		{
+			auto gen = random::make(0);
+
+			const u8* vertex = reinterpret_cast<const u8*>(vertices);
+			vertex += offset;
+
+			Vector3 position = pseudo_cast<Vector3>(vertex[0]);
+			Vector3 center = position;
+			center += pseudo_cast<Vector3>(vertex[1 * stride]);
+			center *= 0.5f;
+
+			Vector3 d = position - center;
+			f32 max_dist_sq = math::dot(d, d);
+			f32 radius_step = step * 0.37f;
+
+			bool done;
+			do
+			{
+				done = true;
+				for (u32 i = 0, index = random::uniform_u32(&gen, 0, num_vertices-1);
+					 i < num_vertices;
+					 i++, index = (index + 1)%num_vertices)
+				{
+					Vector3 position = pseudo_cast<Vector3>(vertex[index * stride]);
+
+					d = position - center;
+					f32 dist_sq = math::dot(d, d);
+
+					if (dist_sq > max_dist_sq)
+					{
+						done = false;
+
+						center = d * radius_step;
+						max_dist_sq = math::lerp(max_dist_sq, dist_sq, step);
+
+						break;
+					}
+				}
+			}
+			while (!done);
+
+			Sphere result;
+
+			result.center = center;
+			result.radius = math::sqrt(max_dist_sq);
+
+			return result;
+		}
 
 	 */
 #endif
@@ -861,8 +917,8 @@ struct Allocator
 */
 
 
-/// An allocator that used the malloc(). Allocations are padded with the size of
+/// An allocator that uses the `malloc()`.
-/// the allocation and align them to the desired alignment
+/// Allocations are padded with to align them to the desired alignment
 struct Heap_Allocator : Allocator
 {
 	Mutex mutex                 = mutex::make();
@@ -878,6 +934,34 @@ struct Heap_Allocator : Allocator
 	virtual s64   total_allocated();
 };
 
+template <usize BUFFER_SIZE>
+struct Temp_Allocator : Allocator
+{
+	u8         buffer[BUFFER_SIZE];
+	Allocator* backing;
+	u8*        physical_start;
+	u8*        current_pointer;
+	u8*        physical_end;
+	usize      chunk_size; // Chunks to allocate from backing allocator
+
+	explicit Temp_Allocator(Allocator* backing);
+	virtual ~Temp_Allocator();
+
+	virtual void* alloc(usize size, usize align = GB_DEFAULT_ALIGNMENT);
+	virtual void  dealloc(const void*) {}
+	virtual s64   allocated_size(const void*) { return -1; }
+	virtual s64   total_allocated() { return -1; }
+};
+
+// Predefined Temp_Allocator sizes to prevent unneeded template instantiation
+template <> using Temp_Allocator64   = Temp_Allocator<64>;
+template <> using Temp_Allocator128  = Temp_Allocator<128>;
+template <> using Temp_Allocator256  = Temp_Allocator<256>;
+template <> using Temp_Allocator512  = Temp_Allocator<512>;
+template <> using Temp_Allocator1024 = Temp_Allocator<1024>;
+template <> using Temp_Allocator2048 = Temp_Allocator<2048>;
+template <> using Temp_Allocator4096 = Temp_Allocator<4096>;
+
 struct Arena_Allocator : Allocator
 {
 	Allocator* backing;
@@ -902,31 +986,11 @@ struct Temporary_Arena_Memory
 	s64              original_count;
 };
 
-template <usize BUFFER_SIZE>
-struct Temp_Allocator : Allocator
-{
-	u8 buffer[BUFFER_SIZE];
-	Allocator* backing;
-	u8*   physical_start;
-	u8*   current_pointer;
-	u8*   physical_end;
-	usize chunk_size; // Chunks to allocate from backing allocator
-
-	explicit Temp_Allocator(Allocator* backing);
-	virtual ~Temp_Allocator();
-
-	virtual void* alloc(usize size, usize align = GB_DEFAULT_ALIGNMENT);
-	virtual void  dealloc(const void*) {}
-	virtual s64 allocated_size(const void*) { return -1; }
-	virtual s64 total_allocated() { return -1; }
-};
-
 namespace arena_allocator
 {
 void clear(Arena_Allocator* arena);
 } // namespace arena_allocator
 
-
 namespace temporary_arena_memory
 {
 Temporary_Arena_Memory make(Arena_Allocator* arena);
@@ -942,18 +1006,28 @@ const void* pointer_add(const void* ptr, usize bytes);
 const void* pointer_sub(const void* ptr, usize bytes);
 
 void* set(void* ptr, u8 value, usize bytes);
+
 void* zero(void* ptr, usize bytes);
 void* copy(void* dest, const void* src, usize bytes);
 void* move(void* dest, const void* src, usize bytes);
 bool equals(const void* a, const void* b, usize bytes);
+
+template <typename T>
+T* zero_struct(T* ptr);
+
+template <typename T>
+T* copy_array(T* dest_array, const T* src_array, usize count);
+
+// TODO(bill): Should I implement something like std::copy, std::fill, std::fill_n ???
 } // namespace memory
 
-inline void* alloc(Allocator* a, usize size, usize align = GB_DEFAULT_ALIGNMENT) { GB_ASSERT(a != nullptr); return a->alloc(size, align); }
+void* alloc(Allocator* a, usize size, usize align = GB_DEFAULT_ALIGNMENT);
-inline void dealloc(Allocator* a, const void* ptr) { GB_ASSERT(a != nullptr); return a->dealloc(ptr); }
+void  dealloc(Allocator* a, const void* ptr);
 
 template <typename T>
 inline T* alloc_struct(Allocator* a) { return static_cast<T*>(alloc(a, sizeof(T), alignof(T))); }
 
+// TODO(bill): Should I keep both or only one of them?
 template <typename T>
 inline T* alloc_array(Allocator* a, usize count) { return static_cast<T*>(alloc(a, count * sizeof(T), alignof(T))); }
 
@@ -1239,6 +1313,7 @@ bool operator>(Time left, Time right);
 bool operator<=(Time left, Time right);
 bool operator>=(Time left, Time right);
 
+Time operator+(Time right);
 Time operator-(Time right);
 
 Time operator+(Time left, Time right);
@@ -1345,21 +1420,20 @@ Temp_Allocator<BUFFER_SIZE>::Temp_Allocator(Allocator* backing_)
 {
 	current_pointer = physical_start = buffer;
 	physical_end = physical_start + BUFFER_SIZE;
-	*static_cast<void**>(physical_start) = 0;
+	*reinterpret_cast<void**>(physical_start) = nullptr;
 	current_pointer = memory::pointer_add(current_pointer, sizeof(void*));
 }
 
 template <usize BUFFER_SIZE>
 Temp_Allocator<BUFFER_SIZE>::~Temp_Allocator()
 {
-	void* ptr = *static_cast<void**>(buffer);
+	void* ptr = *reinterpret_cast<void**>(buffer);
 	while (ptr)
 	{
 		void* next = *static_cast<void**>(ptr);
-		backing_->dealloc(ptr);
+		backing->dealloc(ptr);
 		ptr = next;
 	}
-
 }
 
 template <usize BUFFER_SIZE>
@@ -1367,17 +1441,17 @@ void*
 Temp_Allocator<BUFFER_SIZE>::alloc(usize size, usize align)
 {
 	current_pointer = static_cast<u8*>(memory::align_forward(current_pointer, align));
-	if (size > static_cast<usize>(physical_end) - current_pointer)
+	if (static_cast<intptr>(size) > (physical_end - current_pointer))
 	{
 		usize to_allocate = sizeof(void*) + size + align;
 		if (to_allocate < chunk_size)
 			to_allocate = chunk_size;
 		chunk_size *= 2;
-		void* ptr = backing_->alloc(to_allocate);
+		void* ptr = backing->alloc(to_allocate);
-		*static_cast<void**>(physical_start) = ptr;
+		*reinterpret_cast<void**>(physical_start) = ptr;
 		current_pointer = physical_start = static_cast<u8*>(ptr);
-		*static_cast<void**>(physical_start) = 0;
+		*reinterpret_cast<void**>(physical_start) = 0;
-		current_pointer = memory::pointer_add(current_pointer, sizeof(void*));
+		current_pointer = static_cast<u8*>(memory::pointer_add(current_pointer, sizeof(void*)));
 		current_pointer = static_cast<u8*>(memory::align_forward(current_pointer, align));
 	}
 
@@ -1386,84 +1460,6 @@ Temp_Allocator<BUFFER_SIZE>::alloc(usize size, usize align)
 	return (result);
 }
 
-
-////////////////////////////////
-///                          ///
-/// Memory                   ///
-///                          ///
-////////////////////////////////
-
-namespace memory
-{
-inline void*
-align_forward(void* ptr, usize align)
-{
-	GB_ASSERT(GB_IS_POWER_OF_TWO(align),
-	          "Alignment must be a power of two and not zero -- %llu", align);
-
-	uintptr p = uintptr(ptr);
-	const usize modulo = p % align;
-	if (modulo)
-		p += (align - modulo);
-	return reinterpret_cast<void*>(p);
-}
-
-inline void*
-pointer_add(void* ptr, usize bytes)
-{
-	return static_cast<void*>(static_cast<u8*>(ptr) + bytes);
-}
-
-inline const void*
-pointer_add(const void* ptr, usize bytes)
-{
-	return static_cast<const void*>(static_cast<const u8*>(ptr) + bytes);
-}
-
-inline void*
-pointer_sub(void* ptr, usize bytes)
-{
-	return static_cast<void*>(static_cast<u8*>(ptr) - bytes);
-}
-
-inline const void*
-pointer_sub(const void* ptr, usize bytes)
-{
-	return static_cast<const void*>(static_cast<const u8*>(ptr) - bytes);
-}
-
-inline void*
-set(void* ptr, u8 value, usize bytes)
-{
-	return memset(ptr, value, bytes);
-}
-
-inline void*
-zero(void* ptr, usize bytes)
-{
-	return memory::set(ptr, 0, bytes);
-}
-
-
-inline void*
-copy(void* dest, const void* src, usize bytes)
-{
-	return memcpy(dest, src, bytes);
-}
-
-inline void*
-move(void* dest, const void* src, usize bytes)
-{
-	return memmove(dest, src, bytes);
-}
-
-inline bool
-equals(const void* a, const void* b, usize bytes)
-{
-	return (memcmp(a, b, bytes) == 0);
-}
-} // namespace memory
-
 ////////////////////////////////
 ///                          ///
 /// Array                    ///
@@ -2167,6 +2163,24 @@ remove_all(Hash_Table<T>* h, u64 key)
 } // namespace multi_hash_table
 
 
+namespace memory
+{
+template <typename T>
+inline T*
+zero_struct(T* ptr)
+{
+	return static_cast<T*>(memory::zero(ptr, sizeof(T)));
+}
+
+template <typename T>
+inline T*
+copy_array(T* dest_array, const T* src_array, usize count)
+{
+	return static_cast<T>(memory::copy(dest_array, src_array, count * sizeof(T)));
+}
+} // namespace memory
+
+
 
 
 
@@ -2252,7 +2266,7 @@ __GB_NAMESPACE_START
 
 namespace mutex
 {
-Mutex
+inline Mutex
 make()
 {
 	Mutex m = {};
@@ -2264,7 +2278,7 @@ make()
 	return m;
 }
 
-void
+inline void
 destroy(Mutex* m)
 {
 #if defined(GB_SYSTEM_WINDOWS)
@@ -2275,7 +2289,8 @@ destroy(Mutex* m)
 }
 
 
-void lock(Mutex* m)
+inline void
+lock(Mutex* m)
 {
 #if defined(GB_SYSTEM_WINDOWS)
 	WaitForSingleObject(m->win32_mutex, INFINITE);
@@ -2284,7 +2299,8 @@ void lock(Mutex* m)
 #endif
 }
 
-bool try_lock(Mutex* m)
+inline bool
+try_lock(Mutex* m)
 {
 #if defined(GB_SYSTEM_WINDOWS)
 	return WaitForSingleObject(m->win32_mutex, 0) == WAIT_OBJECT_0;
@@ -2294,7 +2310,8 @@ bool try_lock(Mutex* m)
 }
 
 
-void unlock(Mutex* m)
+inline void
+unlock(Mutex* m)
 {
 #if defined(GB_SYSTEM_WINDOWS)
 	ReleaseMutex(m->win32_mutex);
@@ -2734,7 +2751,7 @@ Heap_Allocator::dealloc(const void* ptr)
 	::free(const_cast<void*>(ptr));
 }
 
-s64
+inline s64
 Heap_Allocator::allocated_size(const void* ptr)
 {
 	mutex::lock(&mutex);
@@ -2746,12 +2763,10 @@ Heap_Allocator::allocated_size(const void* ptr)
 	return static_cast<usize>(malloc_size(ptr));
 #else
 	return static_cast<usize>(malloc_usable_size(const_cast<void*>(ptr)));
-	return
 #endif
-
 }
 
-s64
+inline s64
 Heap_Allocator::total_allocated()
 {
 	return total_allocated_count;
@@ -2785,7 +2800,8 @@ Arena_Allocator::~Arena_Allocator()
 			  "Memory leak of %ld bytes, maybe you forgot to call clear_arena()?", total_allocated_count);
 }
 
-void* Arena_Allocator::alloc(usize size, usize align)
+void*
+Arena_Allocator::alloc(usize size, usize align)
 {
 	s64 actual_size = size + align;
 
@@ -2843,6 +2859,97 @@ free(Temporary_Arena_Memory* tmp)
 } // namespace temporary_arena_memory
 
 
+////////////////////////////////
+///                          ///
+/// Memory                   ///
+///                          ///
+////////////////////////////////
+
+namespace memory
+{
+inline void*
+align_forward(void* ptr, usize align)
+{
+	GB_ASSERT(GB_IS_POWER_OF_TWO(align),
+	          "Alignment must be a power of two and not zero -- %llu", align);
+
+	uintptr p = uintptr(ptr);
+	const usize modulo = p % align;
+	if (modulo)
+		p += (align - modulo);
+	return reinterpret_cast<void*>(p);
+}
+
+inline void*
+pointer_add(void* ptr, usize bytes)
+{
+	return static_cast<void*>(static_cast<u8*>(ptr) + bytes);
+}
+
+inline const void*
+pointer_add(const void* ptr, usize bytes)
+{
+	return static_cast<const void*>(static_cast<const u8*>(ptr) + bytes);
+}
+
+inline void*
+pointer_sub(void* ptr, usize bytes)
+{
+	return static_cast<void*>(static_cast<u8*>(ptr) - bytes);
+}
+
+inline const void*
+pointer_sub(const void* ptr, usize bytes)
+{
+	return static_cast<const void*>(static_cast<const u8*>(ptr) - bytes);
+}
+
+GB_FORCE_INLINE void*
+set(void* ptr, u8 value, usize bytes)
+{
+	return memset(ptr, value, bytes);
+}
+
+GB_FORCE_INLINE void*
+zero(void* ptr, usize bytes)
+{
+	return memory::set(ptr, 0, bytes);
+}
+
+GB_FORCE_INLINE void*
+copy(void* dest, const void* src, usize bytes)
+{
+	return memcpy(dest, src, bytes);
+}
+
+GB_FORCE_INLINE void*
+move(void* dest, const void* src, usize bytes)
+{
+	return memmove(dest, src, bytes);
+}
+
+GB_FORCE_INLINE bool
+equals(const void* a, const void* b, usize bytes)
+{
+	return (memcmp(a, b, bytes) == 0);
+}
+} // namespace memory
+
+inline void*
+alloc(Allocator* a, usize size, usize align)
+{
+	GB_ASSERT(a != nullptr);
+	return a->alloc(size, align);
+}
+
+inline void
+dealloc(Allocator* a, const void* ptr)
+{
+	GB_ASSERT(a != nullptr);
+	if (ptr)
+		a->dealloc(ptr);
+}
+
 ////////////////////////////////
 ///                          ///
 /// String                   ///
@@ -2851,12 +2958,14 @@ free(Temporary_Arena_Memory* tmp)
 
 namespace string
 {
-String make(Allocator* a, const char* str)
+inline String
+make(Allocator* a, const char* str)
 {
 	return string::make(a, str, (string::Size)strlen(str));
 }
 
-String make(Allocator* a, const void* init_str, Size len)
+String
+make(Allocator* a, const void* init_str, Size len)
 {
 	usize header_size = sizeof(string::Header);
 	void* ptr = alloc(a, header_size + len + 1);
@@ -2878,7 +2987,8 @@ String make(Allocator* a, const void* init_str, Size len)
 	return str;
 }
 
-void free(String str)
+void
+free(String str)
 {
 	if (str == nullptr)
 		return;
@@ -2888,22 +2998,26 @@ void free(String str)
 		dealloc(a, h);
 }
 
-String duplicate(Allocator* a, const String str)
+inline String
+duplicate(Allocator* a, const String str)
 {
 	return string::make(a, str, string::length(str));
 }
 
-Size length(const String str)
+inline Size
+length(const String str)
 {
 	return string::header(str)->len;
 }
 
-Size capacity(const String str)
+inline Size
+capacity(const String str)
 {
 	return string::header(str)->cap;
 }
 
-Size available_space(const String str)
+inline Size
+available_space(const String str)
 {
 	string::Header* h = string::header(str);
 	if (h->cap > h->len)
@@ -2911,13 +3025,15 @@ Size available_space(const String str)
 	return 0;
 }
 
-void clear(String str)
+inline void
+clear(String str)
 {
 	string::header(str)->len = 0;
 	str[0] = '\0';
 }
 
-void append(String* str, char c)
+void
+append(String* str, char c)
 {
 	Size curr_len = string::length(*str);
 
@@ -2930,17 +3046,20 @@ void append(String* str, char c)
 	string::header(*str)->len = curr_len + 1;
 }
 
-void append(String* str, const String other)
+inline void
+append(String* str, const String other)
 {
 	string::append(str, other, string::length(other));
 }
 
-void append_cstring(String* str, const char* other)
+inline void
+append_cstring(String* str, const char* other)
 {
 	string::append(str, other, (Size)strlen(other));
 }
 
-void append(String* str, const void* other, Size other_len)
+void
+append(String* str, const void* other, Size other_len)
 {
 	Size curr_len = string::length(*str);
 
@@ -3729,6 +3848,7 @@ bool operator>(Time left, Time right) { return left.microseconds > right.microse
 bool operator<=(Time left, Time right) { return left.microseconds <= right.microseconds; }
 bool operator>=(Time left, Time right) { return left.microseconds >= right.microseconds; }
 
+Time operator+(Time right) { return {+right.microseconds}; }
 Time operator-(Time right) { return {-right.microseconds}; }
 
 Time operator+(Time left, Time right) { return {left.microseconds + right.microseconds}; }
@@ -3954,6 +4074,7 @@ __GB_NAMESPACE_END
 
 /*
 Version History:
+	0.24  - More documentation and bug fixes
 	0.23  - Move Semantics for Array and Hash_Table
 	0.22  - Code rearrangment into namespaces
 	0.21d - Fix array::free

gb_math.hpp

@@ -619,6 +619,7 @@ struct Plane
 bool operator==(const Vector2& a, const Vector2& b);
 bool operator!=(const Vector2& a, const Vector2& b);
 
+Vector2 operator+(const Vector2& a);
 Vector2 operator-(const Vector2& a);
 
 Vector2 operator+(const Vector2& a, const Vector2& b);
@@ -641,6 +642,7 @@ Vector2& operator/=(Vector2& a, f32 scalar);
 bool operator==(const Vector3& a, const Vector3& b);
 bool operator!=(const Vector3& a, const Vector3& b);
 
+Vector3 operator+(const Vector3& a);
 Vector3 operator-(const Vector3& a);
 
 Vector3 operator+(const Vector3& a, const Vector3& b);
@@ -663,6 +665,7 @@ Vector3& operator/=(Vector3& a, f32 scalar);
 bool operator==(const Vector4& a, const Vector4& b);
 bool operator!=(const Vector4& a, const Vector4& b);
 
+Vector4 operator+(const Vector4& a);
 Vector4 operator-(const Vector4& a);
 
 Vector4 operator+(const Vector4& a, const Vector4& b);
@@ -685,6 +688,7 @@ Vector4& operator/=(Vector4& a, f32 scalar);
 bool operator==(const Complex& a, const Complex& b);
 bool operator!=(const Complex& a, const Complex& b);
 
+Complex operator+(const Complex& a);
 Complex operator-(const Complex& a);
 
 Complex operator+(const Complex& a, const Complex& b);
@@ -700,6 +704,7 @@ Complex operator/(const Complex& a, f32 s);
 bool operator==(const Quaternion& a, const Quaternion& b);
 bool operator!=(const Quaternion& a, const Quaternion& b);
 
+Quaternion operator+(const Quaternion& a);
 Quaternion operator-(const Quaternion& a);
 
 Quaternion operator+(const Quaternion& a, const Quaternion& b);
@@ -717,6 +722,9 @@ Vector3 operator*(const Quaternion& a, const Vector3& v); // Rotate v by a
 bool operator==(const Matrix2& a, const Matrix2& b);
 bool operator!=(const Matrix2& a, const Matrix2& b);
 
+Matrix2 operator+(const Matrix2& a);
+Matrix2 operator-(const Matrix2& a);
+
 Matrix2 operator+(const Matrix2& a, const Matrix2& b);
 Matrix2 operator-(const Matrix2& a, const Matrix2& b);
 
@@ -735,6 +743,9 @@ Matrix2& operator*=(Matrix2& a, const Matrix2& b);
 bool operator==(const Matrix3& a, const Matrix3& b);
 bool operator!=(const Matrix3& a, const Matrix3& b);
 
+Matrix3 operator+(const Matrix3& a);
+Matrix3 operator-(const Matrix3& a);
+
 Matrix3 operator+(const Matrix3& a, const Matrix3& b);
 Matrix3 operator-(const Matrix3& a, const Matrix3& b);
 
@@ -753,6 +764,9 @@ Matrix3& operator*=(Matrix3& a, const Matrix3& b);
 bool operator==(const Matrix4& a, const Matrix4& b);
 bool operator!=(const Matrix4& a, const Matrix4& b);
 
+Matrix4 operator+(const Matrix4& a);
+Matrix4 operator-(const Matrix4& a);
+
 Matrix4 operator+(const Matrix4& a, const Matrix4& b);
 Matrix4 operator-(const Matrix4& a, const Matrix4& b);
 
@@ -771,6 +785,7 @@ Matrix4& operator*=(Matrix4& a, const Matrix4& b);
 bool operator==(Angle a, Angle b);
 bool operator!=(Angle a, Angle b);
 
+Angle operator+(Angle a);
 Angle operator-(Angle a);
 
 Angle operator+(Angle a, Angle b);
@@ -892,6 +907,7 @@ s32 kronecker_delta(s32 i, s32 j);
 s64 kronecker_delta(s64 i, s64 j);
 f32 kronecker_delta(f32 i, f32 j);
 
+// NOTE(bill): Just incase
 #undef min
 #undef max
 
@@ -1035,40 +1051,6 @@ look_at_quaternion(const Vector3& eye, const Vector3& center, const Vector3& up
 Vector3 transform_point(const Transform& transform, const Vector3& point);
 Transform inverse(const Transform& t);
 Matrix4 transform_to_matrix4(const Transform& t);
-
-
-template <typename T>
-inline const T&
-min(const T& a, const T& b)
-{
-	return a < b ? a : b;
-}
-
-template <typename T>
-inline const T&
-max(const T& a, const T& b)
-{
-	return a > b ? a : b;
-}
-
-template <typename T>
-inline T
-clamp(const T& x, const T& min, const T& max)
-{
-	if (x < min)
-		return min;
-	if (x > max)
-		return max;
-	return x;
-}
-
-template <typename T>
-inline T
-lerp(const T& x, const T& y, f32 t)
-{
-	return x + (y - x) * t;
-
-}
 } // namespace math
 
 namespace aabb
@@ -1152,6 +1134,27 @@ f32 perlin_3d(f32 x, f32 y, f32 z, s32 x_wrap = 0, s32 y_wrap = 0, s32 z_wrap =
 // f32 simplex_4d_octave(f32 x, f32 y, f32 z, f32 w, f32 octaves, f32 persistence, f32 scale);
 
 } // namespace random
+
+
+namespace math
+{
+template <typename T> inline const T& min(const T& a, const T& b) { return a < b ? a : b; }
+template <typename T> inline const T& max(const T& a, const T& b) { return a > b ? a : b; }
+
+template <typename T>
+inline T
+clamp(const T& x, const T& min, const T& max)
+{
+	if (x < min)
+		return min;
+	if (x > max)
+		return max;
+	return x;
+}
+
+template <typename T> inline T lerp(const T& x, const T& y, f32 t) { return x + (y - x) * t; }
+} // namespace math
+
 __GB_NAMESPACE_END
 
 #endif // GB_INCLUDE_GB_HPP
@@ -1266,6 +1269,12 @@ operator!=(const Vector2& a, const Vector2& b)
 	return !operator==(a, b);
 }
 
+inline Vector2
+operator+(const Vector2& a)
+{
+	return a;
+}
+
 inline Vector2
 operator-(const Vector2& a)
 {
@@ -1363,6 +1372,12 @@ operator!=(const Vector3& a, const Vector3& b)
 	return !operator==(a, b);
 }
 
+inline Vector3
+operator+(const Vector3& a)
+{
+	return a;
+}
+
 inline Vector3
 operator-(const Vector3& a)
 {
@@ -1464,6 +1479,12 @@ operator!=(const Vector4& a, const Vector4& b)
 	return !operator==(a, b);
 }
 
+inline Vector4
+operator+(const Vector4& a)
+{
+	return a;
+}
+
 inline Vector4
 operator-(const Vector4& a)
 {
@@ -1566,8 +1587,13 @@ operator==(const Complex& a, const Complex& b)
 inline bool
 operator!=(const Complex& a, const Complex& b)
 {
-	return
+	return !operator==(a, b);
-	operator==(a, b);
+}
+
+inline Complex
+operator+(const Complex& a)
+{
+	return a;
 }
 
 inline Complex
@@ -1631,6 +1657,12 @@ operator!=(const Quaternion& a, const Quaternion& b)
 	return !operator==(a, b);
 }
 
+inline Quaternion
+operator+(const Quaternion& a)
+{
+	return {+a.x, +a.y, +a.z, +a.w};
+}
+
 inline Quaternion
 operator-(const Quaternion& a)
 {
@@ -1707,6 +1739,18 @@ operator!=(const Matrix2& a, const Matrix2& b)
 	return !operator==(a, b);
 }
 
+inline Matrix2
+operator+(const Matrix2& a)
+{
+	return a;
+}
+
+inline Matrix2
+operator-(const Matrix2& a)
+{
+	return {-a.x, -a.y};
+}
+
 inline Matrix2
 operator+(const Matrix2& a, const Matrix2& b)
 {
@@ -1805,6 +1849,18 @@ operator!=(const Matrix3& a, const Matrix3& b)
 	return !operator==(a, b);
 }
 
+inline Matrix3
+operator+(const Matrix3& a)
+{
+	return a;
+}
+
+inline Matrix3
+operator-(const Matrix3& a)
+{
+	return {-a.x, -a.y, -a.z};
+}
+
 inline Matrix3
 operator+(const Matrix3& a, const Matrix3& b)
 {
@@ -1892,8 +1948,6 @@ operator*=(Matrix3& a, const Matrix3& b)
 }
 
 
-
-
 // Matrix4 Operators
 inline bool
 operator==(const Matrix4& a, const Matrix4& b)
@@ -1912,6 +1966,18 @@ operator!=(const Matrix4& a, const Matrix4& b)
 	return !operator==(a, b);
 }
 
+inline Matrix4
+operator+(const Matrix4& a)
+{
+	return a;
+}
+
+inline Matrix4
+operator-(const Matrix4& a)
+{
+	return {-a.x, -a.y, -a.z, -a.w};
+}
+
 inline Matrix4
 operator+(const Matrix4& a, const Matrix4& b)
 {
@@ -2018,6 +2084,12 @@ operator!=(Angle a, Angle b)
 	return !operator==(a, b);
 }
 
+inline Angle
+operator+(Angle a)
+{
+	return {+a.radians};
+}
+
 inline Angle
 operator-(Angle a)
 {
@@ -3347,7 +3419,7 @@ transform_affine(const Aabb& aabb, const Matrix4& m)
 
 namespace sphere
 {
-inline Sphere
+Sphere
 calculate_min_bounding(const void* vertices, usize num_vertices, usize stride, usize offset, f32 step)
 {
 	auto gen = random::make(0);
@@ -3398,7 +3470,7 @@ calculate_min_bounding(const void* vertices, usize num_vertices, usize stride, u
 	return result;
 }
 
-inline Sphere
+Sphere
 calculate_max_bounding(const void* vertices, usize num_vertices, usize stride, usize offset)
 {
 	Aabb aabb = aabb::calculate(vertices, num_vertices, stride, offset);
@@ -3653,7 +3725,7 @@ uniform_f64(Random* r, f64 min_inc, f64 max_inc)
 }
 
 
-global_variable s32 g_perlin_randtab[512] =
+global_variable const s32 g_perlin_randtab[512] =
 {
    23, 125, 161, 52, 103, 117, 70, 37, 247, 101, 203, 169, 124, 126, 44, 123,
    152, 238, 145, 45, 171, 114, 253, 10, 192, 136, 4, 157, 249, 30, 35, 72,
@@ -3695,7 +3767,7 @@ global_variable s32 g_perlin_randtab[512] =
 internal_linkage f32
 perlin_grad(s32 hash, f32 x, f32 y, f32 z)
 {
-	local_persist f32 basis[12][4] =
+	local_persist const f32 basis[12][4] =
 	{
 		{ 1, 1, 0},
 		{-1, 1, 0},
@@ -3711,7 +3783,7 @@ perlin_grad(s32 hash, f32 x, f32 y, f32 z)
 		{ 0,-1,-1},
 	};
 
-	local_persist u8 indices[64] =
+	local_persist const u8 indices[64] =
 	{
 		0,1,2,3,4,5,6,7,8,9,10,11,
 		0,9,1,11,
@@ -3732,45 +3804,54 @@ perlin_3d(f32 x, f32 y, f32 z, s32 x_wrap, s32 y_wrap, s32 z_wrap)
 	u32 x_mask = (x_wrap-1) & 255;
 	u32 y_mask = (y_wrap-1) & 255;
 	u32 z_mask = (z_wrap-1) & 255;
-	s32 px = (s32)math::floor(x);
-	s32 py = (s32)math::floor(y);
-	s32 pz = (s32)math::floor(z);
-	s32 x0 = px & x_mask, x1 = (px+1) & x_mask;
-	s32 y0 = py & y_mask, y1 = (py+1) & y_mask;
-	s32 z0 = pz & z_mask, z1 = (pz+1) & z_mask;
 
-#define GB__PERLIN_EASE(t) (((t*6-15)*t + 10) *t*t*t)
+	s32 px = static_cast<s32>(math::floor(x));
-	x -= px; f32 u = GB__PERLIN_EASE(x);
+	s32 py = static_cast<s32>(math::floor(y));
-	y -= py; f32 v = GB__PERLIN_EASE(y);
+	s32 pz = static_cast<s32>(math::floor(z));
-	z -= pz; f32 w = GB__PERLIN_EASE(z);
+
+	s32 x0 = (px)   & x_mask;
+	s32 x1 = (px+1) & x_mask;
+	s32 y0 = (py)   & y_mask;
+	s32 y1 = (py+1) & y_mask;
+	s32 z0 = (pz)   & z_mask;
+	s32 z1 = (pz+1) & z_mask;
+
+	x -= px;
+	y -= py;
+	z -= pz;
+
+#define GB__PERLIN_EASE(t) (((6*t - 15)*t + 10)*t*t*t)
+	f32 u = GB__PERLIN_EASE(x);
+	f32 v = GB__PERLIN_EASE(y);
+	f32 w = GB__PERLIN_EASE(z);
 #undef GB__PERLIN_EASE
 
 	s32 r0 = g_perlin_randtab[x0];
 	s32 r1 = g_perlin_randtab[x1];
 
-	s32 r00 = g_perlin_randtab[r0+y0];
+	s32 r00 = g_perlin_randtab[r0 + y0];
-	s32 r01 = g_perlin_randtab[r0+y1];
+	s32 r01 = g_perlin_randtab[r0 + y1];
-	s32 r10 = g_perlin_randtab[r1+y0];
+	s32 r10 = g_perlin_randtab[r1 + y0];
-	s32 r11 = g_perlin_randtab[r1+y1];
+	s32 r11 = g_perlin_randtab[r1 + y1];
 
-	f32 n000 = perlin_grad(g_perlin_randtab[r00+z0], x  , y  , z   );
+	f32 n000 = perlin_grad(g_perlin_randtab[r00 + z0], x,     y,     z    );
-	f32 n001 = perlin_grad(g_perlin_randtab[r00+z1], x  , y  , z-1 );
+	f32 n001 = perlin_grad(g_perlin_randtab[r00 + z1], x,     y,     z - 1);
-	f32 n010 = perlin_grad(g_perlin_randtab[r01+z0], x  , y-1, z   );
+	f32 n010 = perlin_grad(g_perlin_randtab[r01 + z0], x,     y - 1, z    );
-	f32 n011 = perlin_grad(g_perlin_randtab[r01+z1], x  , y-1, z-1 );
+	f32 n011 = perlin_grad(g_perlin_randtab[r01 + z1], x,     y - 1, z - 1);
-	f32 n100 = perlin_grad(g_perlin_randtab[r10+z0], x-1, y  , z   );
+	f32 n100 = perlin_grad(g_perlin_randtab[r10 + z0], x - 1, y,     z    );
-	f32 n101 = perlin_grad(g_perlin_randtab[r10+z1], x-1, y  , z-1 );
+	f32 n101 = perlin_grad(g_perlin_randtab[r10 + z1], x - 1, y,     z - 1);
-	f32 n110 = perlin_grad(g_perlin_randtab[r11+z0], x-1, y-1, z   );
+	f32 n110 = perlin_grad(g_perlin_randtab[r11 + z0], x - 1, y - 1, z    );
-	f32 n111 = perlin_grad(g_perlin_randtab[r11+z1], x-1, y-1, z-1 );
+	f32 n111 = perlin_grad(g_perlin_randtab[r11 + z1], x - 1, y - 1, z - 1);
 
-	f32 n00 = math::lerp(n000,n001,w);
+	f32 n00 = math::lerp(n000, n001, w);
-	f32 n01 = math::lerp(n010,n011,w);
+	f32 n01 = math::lerp(n010, n011, w);
-	f32 n10 = math::lerp(n100,n101,w);
+	f32 n10 = math::lerp(n100, n101, w);
-	f32 n11 = math::lerp(n110,n111,w);
+	f32 n11 = math::lerp(n110, n111, w);
 
-	f32 n0 = math::lerp(n00,n01,v);
+	f32 n0 = math::lerp(n00, n01, v);
-	f32 n1 = math::lerp(n10,n11,v);
+	f32 n1 = math::lerp(n10, n11, v);
 
-	return math::lerp(n0,n1,u);
+	return math::lerp(n0, n1, u);
 }
 
 } // namespace random