mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 05:00:06 -05:00
1dfbd4eff2
-Add new preset dimensions to the right click menu of the width and height fields in the editor. -Change QSS stylesheets to properly handle tabs. -Make tabs rectangular by default. For some reason, they had always been triangular. --Bug fixes -Incremental rendering times in the editor were wrong. --Code changes -Migrate to Qt6. There is probably more work to be done here. -Migrate to VS2022. -Migrate to Wix 4 installer. -Change installer to install to program files for all users. -Fix many VS2022 code analysis warnings. -No longer use byte typedef, because std::byte is now a type. Revert all back to unsigned char. -Upgrade OpenCL headers to version 3.0 and keep locally now rather than trying to look for system files. -No longer link to Nvidia or AMD specific OpenCL libraries. Use the generic installer located at OCL_ROOT too. -Add the ability to change OpenCL grid dimensions. This was attempted for investigating possible performance improvments, but made no difference. This has not been verified on Linux or Mac yet.
126 lines
3.3 KiB
C++
126 lines
3.3 KiB
C++
#pragma once
|
|
|
|
#include "Utils.h"
|
|
|
|
/// <summary>
|
|
/// Affine2D class.
|
|
/// </summary>
|
|
|
|
namespace EmberNs
|
|
{
|
|
/// <summary>
|
|
/// Uses matrix composition to handle the
|
|
/// affine matrix. Taken almost entirely from
|
|
/// Fractron, but using glm, and in C++.
|
|
/// Note that the matrix layout differs from flam3 so it's best to use
|
|
/// the A, B, C, D, E, F wrappers around the underlying matrix indices. But if the matrix must
|
|
/// be accessed directly, the two are laid out as such:
|
|
/// flam3: 3 columns of 2 rows each. Accessed col, row.
|
|
/// [a(0,0)][b(1,0)][c(2,0)]
|
|
/// [d(0,1)][e(1,1)][f(2,1)]
|
|
/// Ember: 2 columns of 3 rows each. Accessed col, row.
|
|
/// [a(0,0)][d(1,0)]
|
|
/// [b(0,1)][e(1,1)]
|
|
/// [c(0,2)][f(1,2)]
|
|
/// Template argument expected to be float or double.
|
|
/// </summary>
|
|
template <typename T>
|
|
class EMBER_API Affine2D
|
|
{
|
|
public:
|
|
Affine2D();
|
|
Affine2D(const Affine2D<T>& affine);
|
|
|
|
/// <summary>
|
|
/// Copy constructor to copy an Affine2D object of type U.
|
|
/// Special case that must be here in the header because it has
|
|
/// a second template parameter.
|
|
/// </summary>
|
|
/// <param name="affine">The Affine2D object to copy</param>
|
|
template <typename U>
|
|
Affine2D(const Affine2D<U>& affine)
|
|
{
|
|
Affine2D<T>::operator=<U>(affine);
|
|
}
|
|
|
|
Affine2D(v2T& x, v2T& y, v2T& t);
|
|
Affine2D(T xx, T xy, T yx, T yy, T tx, T ty);
|
|
Affine2D(m4T& mat);
|
|
Affine2D<T>& operator = (const Affine2D<T>& affine);
|
|
|
|
/// <summary>
|
|
/// Assignment operator to assign an Affine2D object of type U.
|
|
/// Special case that must be here in the header because it has
|
|
/// a second template parameter.
|
|
/// </summary>
|
|
/// <param name="affine">The Affine2D object to copy.</param>
|
|
/// <returns>Reference to updated self</returns>
|
|
template <typename U>
|
|
Affine2D<T>& operator = (const Affine2D<U>& affine)
|
|
{
|
|
A(static_cast<T>(affine.A()));
|
|
B(static_cast<T>(affine.B()));
|
|
C(static_cast<T>(affine.C()));
|
|
D(static_cast<T>(affine.D()));
|
|
E(static_cast<T>(affine.E()));
|
|
F(static_cast<T>(affine.F()));
|
|
return *this;
|
|
}
|
|
|
|
bool operator == (const Affine2D<T>& affine) const;
|
|
v2T operator * (const v2T& v) const;
|
|
Affine2D<T> operator * (T t) const;
|
|
|
|
void MakeID();
|
|
bool IsID() const;
|
|
bool IsZero() const;
|
|
bool IsEmpty() const;
|
|
void Scale(T amount);
|
|
void ScaleXY(T amount);
|
|
Affine2D<T> ScaleCopy(T amount);
|
|
void Rotate(T rad);
|
|
void RotateTrans(T rad);
|
|
void Translate(const v2T& v);
|
|
void RotateScaleXTo(const v2T& v);
|
|
void RotateScaleYTo(const v2T& v);
|
|
Affine2D<T> Inverse() const;
|
|
v2T TransformNormal(const v2T& v) const;
|
|
v2T TransformVector(const v2T& v) const;
|
|
m2T ToMat2ColMajor() const;
|
|
m2T ToMat2RowMajor() const;
|
|
m4T ToMat4ColMajor(bool center = false) const;
|
|
m4T ToMat4RowMajor(bool center = false) const;
|
|
m4T TransToMat4ColMajor() const;
|
|
|
|
//Note that returning a copy is actually faster than a const ref&.
|
|
T A() const;
|
|
T B() const;
|
|
T C() const;
|
|
T D() const;
|
|
T E() const;
|
|
T F() const;
|
|
|
|
void A(T a);
|
|
void B(T b);
|
|
void C(T c);
|
|
void D(T d);
|
|
void E(T e);
|
|
void F(T f);
|
|
|
|
v2T X() const;
|
|
v2T Y() const;
|
|
v2T O() const;
|
|
|
|
void X(const v2T& x);
|
|
void Y(const v2T& y);
|
|
void O(const v2T& t);
|
|
|
|
string ToString() const;
|
|
|
|
static Affine2D CalcRotateScale(const v2T& from, const v2T& to);
|
|
static void CalcRSAC(const v2T& from, const v2T& to, T& a, T& c);
|
|
|
|
m23T m_Mat;
|
|
};
|
|
}
|