mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
6ba16888e3
-Add new variations: crackle, dc_perlin. -Make default palette interp mode be linear instead of step. -Make summary tab the selected one in the Info tab. -Allow for highlight power of up to 10. It was previously limited to 2. --Bug fixes -Direct color calculations were wrong. -Flattening was not applied to final xform. -Fix "pure virtual function call" error on shutdown. --Code changes -Allow for array precalc params in variations by adding a size member to the ParamWithName class. -In IterOpenCLKernelCreator, memcpy precalc params instead of a direct assign since they can now be of variable length. -Add new file VarFuncs to consolidate some functions that are common to multiple variations. This also contains texture data for crackle and dc_perlin. -Place OpenCL versions of these functions in the FunctionMapper class in the EmberCL project. -Add new Singleton class that uses CRTP, is thread safe, and deletes after the last reference goes away. This fixes the usual "delete after main()" problem with singletons that use the static local function variable pattern. -Began saving files with AStyle autoformatter turned on. This will eventually touch all files as they are worked on. -Add missing backslash to CUDA include and library paths for builds on Nvidia systems. -Add missing gl.h include for Windows. -Remove glew include paths from Fractorium, it's not used. -Remove any Nvidia specific #defines and build targets, they are no longer needed with OpenCL 1.2. -Fix bad paths on linux build. -General cleanup.
90 lines
1.8 KiB
C++
90 lines
1.8 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
|
|
|
|
#ifdef _WIN32
|
|
#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>
|
|
#ifdef __APPLE__
|
|
#include <malloc/malloc.h>
|
|
#else
|
|
#include <malloc.h>
|
|
#endif
|
|
#include <map>
|
|
#include <math.h>
|
|
#include <memory>
|
|
#include <numeric>
|
|
#include <ostream>
|
|
#include <sstream>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <thread>
|
|
#include <time.h>
|
|
#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;
|