mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows/Linux sync.

Browse Source
This commit is contained in:
mfeemster 2014-12-11 09:02:42 -08:00
parent a9ecb6a78e
commit 6abd04058a
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Ember/EmberPch.h
View File

@ -59,7 +59,8 @@
#include "tbb/parallel_for.h" #include "tbb/parallel_for.h"
#include "tbb/task_scheduler_init.h" #include "tbb/task_scheduler_init.h"
#define GLM_FORCE_RADIANS #define GLM_FORCE_RADIANS 1
#define GLM_FORCE_INLINE 1
//glm is what's used for matrix math. //glm is what's used for matrix math.
#include "glm/glm.hpp" #include "glm/glm.hpp"

30
Source/Fractorium/FractoriumPch.h
View File

@ -1,5 +1,16 @@
#define GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES 1
#define GLM_FORCE_INLINE 1 #define XFORM_COLOR_COUNT 14
#include "Renderer.h"
#include "RendererCL.h"
#include "VariationList.h"
#include "OpenCLWrapper.h"
#include "XmlToEmber.h"
#include "EmberToXml.h"
#include "SheepTools.h"
#include "JpegUtils.h"
#include "EmberCommon.h"
#include <deque>
#undef QT_OPENGL_ES_2//Make absolutely sure OpenGL ES is not used. #undef QT_OPENGL_ES_2//Make absolutely sure OpenGL ES is not used.
#define QT_NO_OPENGL_ES_2 #define QT_NO_OPENGL_ES_2
@ -23,25 +34,10 @@
#include <QFuture> #include <QFuture>
#include <QtConcurrentRun> #include <QtConcurrentRun>
#include "Renderer.h"
#include "RendererCL.h"
#include "VariationList.h"
#include "OpenCLWrapper.h"
#include "XmlToEmber.h"
#include "EmberToXml.h"
#include "SheepTools.h"
#include "JpegUtils.h"
#include "EmberCommon.h"
#include <deque>
#define GLM_FORCE_RADIANS
#include "glm/glm.hpp" #include "glm/glm.hpp"
#include "glm/gtc/matrix_transform.hpp" #include "glm/gtc/matrix_transform.hpp"
#include "glm/gtc/type_ptr.hpp" #include "glm/gtc/type_ptr.hpp"
#define XFORM_COLOR_COUNT 14
#ifndef WIN32 #ifndef WIN32
#undef Bool #undef Bool
#endif #endif