mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30:06 -05:00
b690bf8071
-Remove the option --intpalette to format the palette in the xml as ints. If they are not hex formatted, then they should always be float. This option was pointless. -Cleanup some options text for the command line programs. -Allow for dragging around flames in the library tab. This is useful for setting up the order of an animation. -Make the opening of large files in Fractorium much more efficient when not-appending. -Make the opening of large files in all EmberRender and EmberAnimate more efficient. -Better error reporting when opening files. --Bug fixes -Get rid of leftover artifacts that would appear on preview thumbnails when either switching SP/DP or re-rendering previews. -Filename extension was not being appended on Linux when saving as Xml, thus making it impossible to drag that file back in becase drop is filtered on extension. --Code changes -Move GCC compiler spec to C++14. Building with 5.3 now on linux. -Use inline member data initializers. -Make a #define for static for use in Utils.h to make things a little cleaner. -Make various functions able to take arbitrary collections as their parameters rather than just vectors. -Make library collection a list rather than vector. This alleviates the need to re-sync pointers whenever the collection changes. -Subclass QTreeWidget for the library tree. Two new files added for this. -Remove all usage of #ifdef ROW_ONLY_DE in DEOpenCLKernelCreator, it was never used. -Add move constructor and assignment operator to EmberFile. -Add the ability to use a pointer to outside memory in the renderer for the vector of Ember<T>. -Make a lot more functions const where they should be.
95 lines
2.0 KiB
C++
95 lines
2.0 KiB
C++
#ifdef _WIN32
|
|
#pragma once
|
|
#endif
|
|
|
|
/// <summary>
|
|
/// Precompiled header file. Place all system includes here with appropriate #defines for different operating systems and compilers.
|
|
/// </summary>
|
|
|
|
#define NOMINMAX
|
|
#define _USE_MATH_DEFINES
|
|
#define __TBB_NO_IMPLICIT_LINKAGE 1//Prevent tbb from automatically looking for tbb_debug.lib. We only care about the release tbb.lib/dll.
|
|
|
|
#ifdef _WIN32
|
|
#pragma warning(disable : 4251; disable : 4661; disable : 4100)
|
|
#define basename(x) _strdup(x)
|
|
#define snprintf _snprintf
|
|
#define snprintf_s _snprintf_s
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#define EMBER_OS "WIN"
|
|
|
|
#include <SDKDDKVer.h>
|
|
#include <windows.h>
|
|
#elif __APPLE__
|
|
#define EMBER_OS "OSX"
|
|
#else
|
|
#include <libgen.h>
|
|
#include <unistd.h>
|
|
#define EMBER_OS "LNX"
|
|
#endif
|
|
|
|
//Standard headers.
|
|
#include <algorithm>
|
|
#include <array>
|
|
#include <chrono>
|
|
#include <complex>
|
|
#include <cstdint>
|
|
#include <fstream>
|
|
#include <functional>
|
|
#include <inttypes.h>
|
|
#include <iostream>
|
|
#include <iomanip>
|
|
#include <limits>
|
|
#include <list>
|
|
#ifdef __APPLE__
|
|
#include <malloc/malloc.h>
|
|
#else
|
|
#include <malloc.h>
|
|
#endif
|
|
#include <map>
|
|
#include <math.h>
|
|
#include <memory>
|
|
#include <mutex>
|
|
#include <numeric>
|
|
#include <ostream>
|
|
#include <sstream>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <thread>
|
|
#include <time.h>
|
|
#include <type_traits>
|
|
#include <vector>
|
|
#include <unordered_map>
|
|
|
|
//Third party headers.
|
|
#ifdef _WIN32
|
|
#include "libxml/parser.h"
|
|
#else
|
|
#include "libxml2/libxml/parser.h"
|
|
#endif
|
|
|
|
//Intel's Threading Building Blocks is what's used for all threading.
|
|
#include <tbb/task_group.h>
|
|
#include <tbb/parallel_for.h>
|
|
#include <tbb/task_scheduler_init.h>
|
|
|
|
#define GLM_FORCE_RADIANS 1
|
|
#ifndef __APPLE__
|
|
#define GLM_FORCE_INLINE 1
|
|
#endif
|
|
|
|
//glm is what's used for matrix math.
|
|
#include <glm/glm.hpp>
|
|
#include <glm/detail/type_int.hpp>
|
|
#include <glm/gtc/matrix_transform.hpp>
|
|
#include <glm/gtc/type_ptr.hpp>
|
|
#include <glm/gtx/string_cast.hpp>
|
|
|
|
using namespace tbb;
|
|
using namespace std;
|
|
using namespace std::chrono;
|
|
using namespace glm;
|
|
using namespace glm::detail;
|
|
using glm::uint;
|
|
using glm::uint16;
|