mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-02-01 10:30:08 -05:00
--User changes
-Added pixel_flow variation from user bezo97.
This commit is contained in:
Person
parent
b0dae7795a
commit
90e7097d7f
@ -402,6 +402,13 @@ uint Timing::m_ProcessorCount;
|
||||
EXPORTPREPOSTREGVAR(TileLog, T) \
|
||||
EXPORTPREPOSTREGVAR(TruchetFill, T) \
|
||||
EXPORTPREPOSTREGVAR(Waves2Radial, T) \
|
||||
EXPORTPREPOSTREGVAR(Panorama1, T) \
|
||||
EXPORTPREPOSTREGVAR(Panorama2, T) \
|
||||
EXPORTPREPOSTREGVAR(Helicoid, T) \
|
||||
EXPORTPREPOSTREGVAR(Helix, T) \
|
||||
EXPORTPREPOSTREGVAR(Sphereblur, T) \
|
||||
EXPORTPREPOSTREGVAR(Cpow3, T) \
|
||||
EXPORTPREPOSTREGVAR(Concentric, T) \
|
||||
template EMBER_API class PostSmartcropVariation<T>; /*Only implemented as post.*/ \
|
||||
EXPORTPREPOSTREGVAR(DCBubble, T) \
|
||||
EXPORTPREPOSTREGVAR(DCCarpet, T) \
|
||||
@ -412,6 +419,8 @@ uint Timing::m_ProcessorCount;
|
||||
EXPORTPREPOSTREGVAR(DCPerlin, T) \
|
||||
EXPORTPREPOSTREGVAR(DCZTransl, T) \
|
||||
EXPORTPREPOSTREGVAR(DCTriangle, T) \
|
||||
EXPORTPREPOSTREGVAR(RandCubes, T) \
|
||||
EXPORTPREPOSTREGVAR(PixelFlow, T) \
|
||||
template EMBER_API class VariationList<T>; \
|
||||
template EMBER_API class SpatialFilter<T>; \
|
||||
template EMBER_API class GaussianFilter<T>; \
|
||||
|
||||
@ -268,6 +268,7 @@ enum class eVariationId : et
|
||||
VAR_PHOENIX_JULIA,
|
||||
VAR_PIE ,
|
||||
VAR_PIE3D ,
|
||||
VAR_PIXEL_FLOW ,
|
||||
VAR_POINCARE ,
|
||||
VAR_POINCARE3D ,
|
||||
VAR_POLAR ,
|
||||
@ -610,6 +611,7 @@ enum class eVariationId : et
|
||||
VAR_PRE_PHOENIX_JULIA,
|
||||
VAR_PRE_PIE,
|
||||
VAR_PRE_PIE3D,
|
||||
VAR_PRE_PIXEL_FLOW,
|
||||
VAR_PRE_POINCARE,
|
||||
VAR_PRE_POINCARE3D,
|
||||
VAR_PRE_POLAR,
|
||||
@ -952,6 +954,7 @@ enum class eVariationId : et
|
||||
VAR_POST_PHOENIX_JULIA,
|
||||
VAR_POST_PIE,
|
||||
VAR_POST_PIE3D,
|
||||
VAR_POST_PIXEL_FLOW,
|
||||
VAR_POST_POINCARE,
|
||||
VAR_POST_POINCARE3D,
|
||||
VAR_POST_POLAR,
|
||||
|
||||
@ -372,6 +372,7 @@ VariationList<T>::VariationList()
|
||||
ADDPREPOSTREGVAR(DCTriangle)
|
||||
ADDPREPOSTREGVAR(DCZTransl)
|
||||
ADDPREPOSTREGVAR(RandCubes)
|
||||
ADDPREPOSTREGVAR(PixelFlow)
|
||||
|
||||
for (auto var : m_Variations) const_cast<Variation<T>*>(var)->Precalc();//Modify once here, then const after this.
|
||||
|
||||
|
||||
@ -1551,6 +1551,103 @@ private:
|
||||
T m_Density;
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
/// pixel_flow.
|
||||
/// </summary>
|
||||
template <typename T>
|
||||
class PixelFlowVariation : public ParametricVariation<T>
|
||||
{
|
||||
public:
|
||||
PixelFlowVariation(T weight = 1.0) : ParametricVariation<T>("pixel_flow", eVariationId::VAR_PIXEL_FLOW, weight)
|
||||
{
|
||||
Init();
|
||||
}
|
||||
|
||||
PARVARCOPY(PixelFlowVariation)
|
||||
|
||||
virtual void Func(IteratorHelper<T>& helper, Point<T>& outPoint, QTIsaac<ISAAC_SIZE, ISAAC_INT>& rand) override
|
||||
{
|
||||
T xl, yl;
|
||||
sincos(m_Rad, &xl, &yl);
|
||||
auto blockx = (int)Floor(helper.In.x * m_Width);//Calculate which block we're in.
|
||||
blockx += int(2 - 4 * VarFuncs<T>::Hash(int(blockx * m_Seed + 1)));//Varying width and length.
|
||||
auto blocky = (int)Floor(helper.In.y * m_Width);
|
||||
blocky += int(2 - 4 * VarFuncs<T>::Hash(int(blocky * m_Seed + 1)));
|
||||
T fLen = (VarFuncs<T>::Hash(int(blocky + blockx * -m_Seed)) + VarFuncs<T>::Hash(int(blockx + blocky * m_Seed * T(0.5)))) * T(0.5); //doesnt matter just needs to be random enough
|
||||
T r01 = rand.Frand01<T>();
|
||||
T fade = fLen * r01 * r01 * r01 * r01;//Fading effect.
|
||||
helper.Out.x = m_Weight * m_Len * xl * fade;
|
||||
helper.Out.y = m_Weight * m_Len * yl * fade;
|
||||
helper.Out.z = DefaultZ(helper);
|
||||
|
||||
if (m_EnableDC)
|
||||
outPoint.m_ColorX = r01;//Direct color.
|
||||
}
|
||||
|
||||
virtual string OpenCLString() const override
|
||||
{
|
||||
ostringstream ss, ss2;
|
||||
intmax_t i = 0, varIndex = IndexInXform();
|
||||
ss2 << "_" << XformIndexInEmber() << "]";
|
||||
string index = ss2.str();
|
||||
string weight = WeightDefineString();
|
||||
string angle = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
|
||||
string len = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
|
||||
string width = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
|
||||
string seed = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
|
||||
string dc = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
|
||||
string rad = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
|
||||
ss << "\t{\n"
|
||||
<< "\t\treal_t xl, yl;\n"
|
||||
<< "\t\txl = sincos(" << rad << ", &yl);\n"
|
||||
<< "\t\tint blockx = (int)floor(vIn.x * " << width << ");\n"
|
||||
<< "\t\tblockx += (int)(2 - 4 * Hash((int)(blockx * " << seed << " + 1)));\n"
|
||||
<< "\t\tint blocky = (int)floor(vIn.y * " << width << ");\n"
|
||||
<< "\t\tblocky += (int)(2 - 4 * Hash((int)(blocky * " << seed << " + 1)));\n"
|
||||
<< "\t\treal_t fLen = (Hash((int)(blocky + blockx * -" << seed << ")) + Hash((int)(blockx + blocky * " << seed << " * (real_t)0.5))) * (real_t)0.5;\n"
|
||||
<< "\t\treal_t r01 = MwcNext01(mwc);\n"
|
||||
<< "\t\treal_t fade = fLen * r01 * r01 * r01 * r01;\n"
|
||||
<< "\t\tvOut.x = " << weight << " * " << len << " * xl * fade;\n"
|
||||
<< "\t\tvOut.y = " << weight << " * " << len << " * yl * fade;\n"
|
||||
<< "\t\tvOut.z = " << DefaultZCl()
|
||||
<< "\t\tif (" << dc << ")\n"
|
||||
<< "\t\t\toutPoint->m_ColorX = r01;\n"
|
||||
<< "\t}\n";
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
virtual void Precalc() override
|
||||
{
|
||||
m_Rad = m_Angle * DEG_2_RAD_T;
|
||||
}
|
||||
|
||||
virtual vector<string> OpenCLGlobalFuncNames() const override
|
||||
{
|
||||
return vector<string> { "Hash" };
|
||||
}
|
||||
|
||||
protected:
|
||||
void Init()
|
||||
{
|
||||
string prefix = Prefix();
|
||||
m_Params.clear();
|
||||
m_Params.push_back(ParamWithName<T>(&m_Angle, prefix + "pixel_flow_angle", 90));
|
||||
m_Params.push_back(ParamWithName<T>(&m_Len, prefix + "pixel_flow_len", T(0.1)));
|
||||
m_Params.push_back(ParamWithName<T>(&m_Width, prefix + "pixel_flow_width", 200));
|
||||
m_Params.push_back(ParamWithName<T>(&m_Seed, prefix + "pixel_flow_seed", 42, eParamType::INTEGER));
|
||||
m_Params.push_back(ParamWithName<T>(&m_EnableDC, prefix + "pixel_flow_enable_dc", 0, eParamType::INTEGER, 0, 1));
|
||||
m_Params.push_back(ParamWithName<T>(true, &m_Rad, prefix + "pixel_flow_rad"));
|
||||
}
|
||||
|
||||
private:
|
||||
T m_Angle;
|
||||
T m_Len;
|
||||
T m_Width;
|
||||
T m_Seed;
|
||||
T m_EnableDC;
|
||||
T m_Rad;//Precalc.
|
||||
};
|
||||
|
||||
MAKEPREPOSTPARVAR(DCBubble, dc_bubble, DC_BUBBLE)
|
||||
MAKEPREPOSTPARVAR(DCCarpet, dc_carpet, DC_CARPET)
|
||||
MAKEPREPOSTPARVARASSIGN(DCCube, dc_cube, DC_CUBE, eVariationAssignType::ASSIGNTYPE_SUM)
|
||||
@ -1561,4 +1658,5 @@ MAKEPREPOSTPARVAR(DCTriangle, dc_triangle, DC_TRIANGLE)
|
||||
MAKEPREPOSTPARVAR(DCZTransl, dc_ztransl, DC_ZTRANSL)
|
||||
MAKEPREPOSTPARVAR(DCPerlin, dc_perlin, DC_PERLIN)
|
||||
MAKEPREPOSTPARVAR(RandCubes, randCubes, RAND_CUBES)
|
||||
MAKEPREPOSTPARVARASSIGN(PixelFlow, pixel_flow, PIXEL_FLOW, eVariationAssignType::ASSIGNTYPE_SUM)
|
||||
}
|
||||
|
||||
@ -172,7 +172,12 @@ XmlToEmber<T>::XmlToEmber()
|
||||
{ "radius", "concentric_radius" },
|
||||
//{ "density", "concentric_density" },//Can't have two, which means you can never properly paste from Apophysis with both of these in one xform.
|
||||
{ "R_blur", "concentric_R_blur" },
|
||||
{ "Z_blur", "concentric_Z_blur" }
|
||||
{ "Z_blur", "concentric_Z_blur" },
|
||||
{ "angle", "pixel_flow_angle" },
|
||||
{ "len", "pixel_flow_len" },
|
||||
{ "width", "pixel_flow_width" },
|
||||
//{ "seed", "pixel_flow_seed" },//randCubes above already uses "seed", but it's just for randomness, so it shouldn't matter.
|
||||
{ "enable_dc", "pixel_flow_enable_dc" }
|
||||
};
|
||||
m_FlattenNames =
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user