# HG changeset patch # User John Tsiombikas # Date 1451384393 -7200 # Node ID bab25c0ce3379cae1286ea05c4574070fcbcda32 # Parent a2afaf8af09b42af6baa003574f61842d0fd0662 started gmath conversion diff -r a2afaf8af09b -r bab25c0ce337 liberebus/Makefile --- a/liberebus/Makefile Fri Sep 18 06:47:41 2015 +0300 +++ b/liberebus/Makefile Tue Dec 29 12:19:53 2015 +0200 @@ -9,7 +9,7 @@ api_minor = 1 CXXFLAGS = -std=c++11 -pthread -pedantic $(warn) $(dbg) $(opt) $(pic) -LDFLAGS = -pthread -lvmath -limago -lm +LDFLAGS = -pthread -lgmath -limago -lm ifeq ($(shell uname -s), Darwin) shared = -dynamiclib diff -r a2afaf8af09b -r bab25c0ce337 liberebus/src/bvol.h --- a/liberebus/src/bvol.h Fri Sep 18 06:47:41 2015 +0300 +++ b/liberebus/src/bvol.h Tue Dec 29 12:19:53 2015 +0200 @@ -1,7 +1,7 @@ #ifndef BVOL_H_ #define BVOL_H_ -#include "vmath/ray.h" +#include class AABox { public: diff -r a2afaf8af09b -r bab25c0ce337 liberebus/src/camera.h --- a/liberebus/src/camera.h Fri Sep 18 06:47:41 2015 +0300 +++ b/liberebus/src/camera.h Tue Dec 29 12:19:53 2015 +0200 @@ -1,7 +1,7 @@ #ifndef CAMERA_H_ #define CAMERA_H_ -#include "vmath/vmath.h" +#include class Camera { protected: diff -r a2afaf8af09b -r bab25c0ce337 liberebus/src/color.h --- a/liberebus/src/color.h Fri Sep 18 06:47:41 2015 +0300 +++ b/liberebus/src/color.h Tue Dec 29 12:19:53 2015 +0200 @@ -1,7 +1,7 @@ #ifndef COLOR_H_ #define COLOR_H_ -#include "vmath/vector.h" +#include typedef Vector4 Color; diff -r a2afaf8af09b -r bab25c0ce337 liberebus/src/erebus_impl.h --- a/liberebus/src/erebus_impl.h Fri Sep 18 06:47:41 2015 +0300 +++ b/liberebus/src/erebus_impl.h Tue Dec 29 12:19:53 2015 +0200 @@ -2,7 +2,7 @@ #define EREBUS_IMPL_H_ #include -#include +#include #include "erebus.h" #include "image.h" #include "scene.h" diff -r a2afaf8af09b -r bab25c0ce337 liberebus/src/geomobj.cc --- a/liberebus/src/geomobj.cc Fri Sep 18 06:47:41 2015 +0300 +++ b/liberebus/src/geomobj.cc Tue Dec 29 12:19:53 2015 +0200 @@ -1,6 +1,6 @@ #include #include -#include +#include #include "geomobj.h" #include "erebus_impl.h" diff -r a2afaf8af09b -r bab25c0ce337 liberebus/src/object.h --- a/liberebus/src/object.h Fri Sep 18 06:47:41 2015 +0300 +++ b/liberebus/src/object.h Tue Dec 29 12:19:53 2015 +0200 @@ -2,7 +2,7 @@ #define OBJECT_H_ #include -#include "vmath/ray.h" +#include class Object; class SceneNode; diff -r a2afaf8af09b -r bab25c0ce337 liberebus/src/snode.h --- a/liberebus/src/snode.h Fri Sep 18 06:47:41 2015 +0300 +++ b/liberebus/src/snode.h Tue Dec 29 12:19:53 2015 +0200 @@ -3,7 +3,7 @@ #include #include "object.h" -#include "vmath/vmath.h" +#include "gmath/gmath.h" class SceneNode { private: