diff --git a/source/filter-transform.cpp b/source/filter-transform.cpp
index 130da6b..b9865f5 100644
--- a/source/filter-transform.cpp
+++ b/source/filter-transform.cpp
@@ -22,60 +22,54 @@
 #include "util-math.h"
 
 extern "C" {
-	#pragma warning (push)
-	#pragma warning (disable: 4201)
-	#include "util/platform.h"
-	#include "graphics/graphics.h"
-	#include "graphics/matrix4.h"
-	#pragma warning (pop)
+#pragma warning(push)
+#pragma warning(disable : 4201)
+#include "util/platform.h"
+#include "graphics/graphics.h"
+#include "graphics/matrix4.h"
+#pragma warning(pop)
 }
 
 // Initializer & Finalizer
 static Filter::Transform* filterTransformInstance;
-INITIALIZER(FilterTransformInit) {
-	initializerFunctions.push_back([] {
-		filterTransformInstance = new Filter::Transform();
-	});
-	finalizerFunctions.push_back([] {
-		delete filterTransformInstance;
-	});
+INITIALIZER(FilterTransformInit)
+{
+	initializerFunctions.push_back([] { filterTransformInstance = new Filter::Transform(); });
+	finalizerFunctions.push_back([] { delete filterTransformInstance; });
 }
 
-#define ST					"Filter.Transform"
-#define ST_CAMERA				"Filter.Transform.Camera"
-#define ST_CAMERA_ORTHOGRAPHIC			"Filter.Transform.Camera.Orthographic"
-#define ST_CAMERA_PERSPECTIVE			"Filter.Transform.Camera.Perspective"
-#define ST_CAMERA_FIELDOFVIEW			"Filter.Transform.Camera.FieldOfView"
-#define ST_POSITION				"Filter.Transform.Position"
-#define ST_POSITION_X				"Filter.Transform.Position.X"
-#define ST_POSITION_Y				"Filter.Transform.Position.Y"
-#define ST_POSITION_Z				"Filter.Transform.Position.Z"
-#define ST_ROTATION				"Filter.Transform.Rotation"
-#define ST_ROTATION_X				"Filter.Transform.Rotation.X"
-#define ST_ROTATION_Y				"Filter.Transform.Rotation.Y"
-#define ST_ROTATION_Z				"Filter.Transform.Rotation.Z"
-#define ST_SCALE				"Filter.Transform.Scale"
-#define ST_SCALE_X				"Filter.Transform.Scale.X"
-#define ST_SCALE_Y				"Filter.Transform.Scale.Y"
-#define ST_SHEAR				"Filter.Transform.Shear"
-#define ST_SHEAR_X				"Filter.Transform.Shear.X"
-#define ST_SHEAR_Y				"Filter.Transform.Shear.Y"
-#define ST_ROTATION_ORDER			"Filter.Transform.Rotation.Order"
-#define ST_ROTATION_ORDER_XYZ			"Filter.Transform.Rotation.Order.XYZ"
-#define ST_ROTATION_ORDER_XZY			"Filter.Transform.Rotation.Order.XZY"
-#define ST_ROTATION_ORDER_YXZ			"Filter.Transform.Rotation.Order.YXZ"
-#define ST_ROTATION_ORDER_YZX			"Filter.Transform.Rotation.Order.YZX"
-#define ST_ROTATION_ORDER_ZXY			"Filter.Transform.Rotation.Order.ZXY"
-#define ST_ROTATION_ORDER_ZYX			"Filter.Transform.Rotation.Order.ZYX"
+#define ST "Filter.Transform"
+#define ST_CAMERA "Filter.Transform.Camera"
+#define ST_CAMERA_ORTHOGRAPHIC "Filter.Transform.Camera.Orthographic"
+#define ST_CAMERA_PERSPECTIVE "Filter.Transform.Camera.Perspective"
+#define ST_CAMERA_FIELDOFVIEW "Filter.Transform.Camera.FieldOfView"
+#define ST_POSITION "Filter.Transform.Position"
+#define ST_POSITION_X "Filter.Transform.Position.X"
+#define ST_POSITION_Y "Filter.Transform.Position.Y"
+#define ST_POSITION_Z "Filter.Transform.Position.Z"
+#define ST_ROTATION "Filter.Transform.Rotation"
+#define ST_ROTATION_X "Filter.Transform.Rotation.X"
+#define ST_ROTATION_Y "Filter.Transform.Rotation.Y"
+#define ST_ROTATION_Z "Filter.Transform.Rotation.Z"
+#define ST_SCALE "Filter.Transform.Scale"
+#define ST_SCALE_X "Filter.Transform.Scale.X"
+#define ST_SCALE_Y "Filter.Transform.Scale.Y"
+#define ST_SHEAR "Filter.Transform.Shear"
+#define ST_SHEAR_X "Filter.Transform.Shear.X"
+#define ST_SHEAR_Y "Filter.Transform.Shear.Y"
+#define ST_ROTATION_ORDER "Filter.Transform.Rotation.Order"
+#define ST_ROTATION_ORDER_XYZ "Filter.Transform.Rotation.Order.XYZ"
+#define ST_ROTATION_ORDER_XZY "Filter.Transform.Rotation.Order.XZY"
+#define ST_ROTATION_ORDER_YXZ "Filter.Transform.Rotation.Order.YXZ"
+#define ST_ROTATION_ORDER_YZX "Filter.Transform.Rotation.Order.YZX"
+#define ST_ROTATION_ORDER_ZXY "Filter.Transform.Rotation.Order.ZXY"
+#define ST_ROTATION_ORDER_ZYX "Filter.Transform.Rotation.Order.ZYX"
 
-static const float farZ = 2097152.0f; // 2 pow 21
-static const float nearZ = 1.0f / farZ;
+static const float farZ       = 2097152.0f; // 2 pow 21
+static const float nearZ      = 1.0f / farZ;
 static const float valueLimit = 65536.0f;
 
-enum class CameraMode : int32_t {
-	Orthographic,
-	Perspective
-};
+enum class CameraMode : int32_t { Orthographic, Perspective };
 
 enum RotationOrder : int64_t {
 	XYZ,
@@ -86,21 +80,22 @@ enum RotationOrder : int64_t {
 	ZYX,
 };
 
-Filter::Transform::Transform() {
+Filter::Transform::Transform()
+{
 	memset(&sourceInfo, 0, sizeof(obs_source_info));
-	sourceInfo.id = "obs-stream-effects-filter-transform";
-	sourceInfo.type = OBS_SOURCE_TYPE_FILTER;
-	sourceInfo.output_flags = OBS_SOURCE_VIDEO;
-	sourceInfo.get_name = get_name;
-	sourceInfo.get_defaults = get_defaults;
+	sourceInfo.id             = "obs-stream-effects-filter-transform";
+	sourceInfo.type           = OBS_SOURCE_TYPE_FILTER;
+	sourceInfo.output_flags   = OBS_SOURCE_VIDEO;
+	sourceInfo.get_name       = get_name;
+	sourceInfo.get_defaults   = get_defaults;
 	sourceInfo.get_properties = get_properties;
 
-	sourceInfo.create = create;
-	sourceInfo.destroy = destroy;
-	sourceInfo.update = update;
-	sourceInfo.activate = activate;
-	sourceInfo.deactivate = deactivate;
-	sourceInfo.video_tick = video_tick;
+	sourceInfo.create       = create;
+	sourceInfo.destroy      = destroy;
+	sourceInfo.update       = update;
+	sourceInfo.activate     = activate;
+	sourceInfo.deactivate   = deactivate;
+	sourceInfo.video_tick   = video_tick;
 	sourceInfo.video_render = video_render;
 
 	obs_register_source(&sourceInfo);
@@ -108,14 +103,15 @@ Filter::Transform::Transform() {
 
 Filter::Transform::~Transform() {}
 
-const char* Filter::Transform::get_name(void *) {
+const char* Filter::Transform::get_name(void*)
+{
 	return P_TRANSLATE(ST);
 }
 
-void Filter::Transform::get_defaults(obs_data_t *data) {
+void Filter::Transform::get_defaults(obs_data_t* data)
+{
 	obs_data_set_default_int(data, ST_CAMERA, (int64_t)CameraMode::Orthographic);
-	obs_data_set_default_double(data, ST_CAMERA_FIELDOFVIEW,
-		90.0);
+	obs_data_set_default_double(data, ST_CAMERA_FIELDOFVIEW, 90.0);
 	obs_data_set_default_double(data, ST_POSITION_X, 0);
 	obs_data_set_default_double(data, ST_POSITION_Y, 0);
 	obs_data_set_default_double(data, ST_POSITION_Z, 0);
@@ -128,26 +124,23 @@ void Filter::Transform::get_defaults(obs_data_t *data) {
 	obs_data_set_default_double(data, ST_SHEAR_Y, 0);
 	obs_data_set_default_bool(data, S_ADVANCED, false);
 	obs_data_set_default_int(data, ST_ROTATION_ORDER,
-		RotationOrder::ZXY); //ZXY
+							 RotationOrder::ZXY); //ZXY
 }
 
-obs_properties_t * Filter::Transform::get_properties(void *) {
-	obs_properties_t *pr = obs_properties_create();
-	obs_property_t* p = NULL;
+obs_properties_t* Filter::Transform::get_properties(void*)
+{
+	obs_properties_t* pr = obs_properties_create();
+	obs_property_t*   p  = NULL;
 
-	p = obs_properties_add_list(pr, ST_CAMERA, P_TRANSLATE(ST_CAMERA),
-		OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+	p = obs_properties_add_list(pr, ST_CAMERA, P_TRANSLATE(ST_CAMERA), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
 	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(ST_CAMERA)));
-	obs_property_list_add_int(p, P_TRANSLATE(ST_CAMERA_ORTHOGRAPHIC),
-		(int64_t)CameraMode::Orthographic);
-	obs_property_list_add_int(p, P_TRANSLATE(ST_CAMERA_PERSPECTIVE),
-		(int64_t)CameraMode::Perspective);
+	obs_property_list_add_int(p, P_TRANSLATE(ST_CAMERA_ORTHOGRAPHIC), (int64_t)CameraMode::Orthographic);
+	obs_property_list_add_int(p, P_TRANSLATE(ST_CAMERA_PERSPECTIVE), (int64_t)CameraMode::Perspective);
 	obs_property_set_modified_callback(p, modified_properties);
 
-	p = obs_properties_add_float_slider(pr, ST_CAMERA_FIELDOFVIEW,
-		P_TRANSLATE(ST_CAMERA_FIELDOFVIEW), 1.0, 179.0, 0.01);
-	obs_property_set_long_description(p,
-		P_TRANSLATE(P_DESC(ST_CAMERA_FIELDOFVIEW)));
+	p = obs_properties_add_float_slider(pr, ST_CAMERA_FIELDOFVIEW, P_TRANSLATE(ST_CAMERA_FIELDOFVIEW), 1.0, 179.0,
+										0.01);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(ST_CAMERA_FIELDOFVIEW)));
 
 	// Position, Scale, Rotation
 	{
@@ -157,10 +150,8 @@ obs_properties_t * Filter::Transform::get_properties(void *) {
 			std::make_pair(ST_POSITION_Z, P_DESC(ST_POSITION_Z)),
 		};
 		for (auto kv : entries) {
-			p = obs_properties_add_float(pr, kv.first,
-				P_TRANSLATE(kv.first), -10000, 10000, 0.01);
-			obs_property_set_long_description(p,
-				P_TRANSLATE(kv.second));
+			p = obs_properties_add_float(pr, kv.first, P_TRANSLATE(kv.first), -10000, 10000, 0.01);
+			obs_property_set_long_description(p, P_TRANSLATE(kv.second));
 		}
 	}
 	{
@@ -170,10 +161,8 @@ obs_properties_t * Filter::Transform::get_properties(void *) {
 			std::make_pair(ST_ROTATION_Z, P_DESC(ST_ROTATION_Z)),
 		};
 		for (auto kv : entries) {
-			p = obs_properties_add_float_slider(pr, kv.first,
-				P_TRANSLATE(kv.first), -180, 180, 0.01);
-			obs_property_set_long_description(p,
-				P_TRANSLATE(kv.second));
+			p = obs_properties_add_float_slider(pr, kv.first, P_TRANSLATE(kv.first), -180, 180, 0.01);
+			obs_property_set_long_description(p, P_TRANSLATE(kv.second));
 		}
 	}
 	{
@@ -182,10 +171,8 @@ obs_properties_t * Filter::Transform::get_properties(void *) {
 			std::make_pair(ST_SCALE_Y, P_DESC(ST_SCALE_Y)),
 		};
 		for (auto kv : entries) {
-			p = obs_properties_add_float_slider(pr, kv.first,
-				P_TRANSLATE(kv.first), -1000, 1000, 0.01);
-			obs_property_set_long_description(p,
-				P_TRANSLATE(kv.second));
+			p = obs_properties_add_float_slider(pr, kv.first, P_TRANSLATE(kv.first), -1000, 1000, 0.01);
+			obs_property_set_long_description(p, P_TRANSLATE(kv.second));
 		}
 	}
 	{
@@ -194,116 +181,108 @@ obs_properties_t * Filter::Transform::get_properties(void *) {
 			std::make_pair(ST_SHEAR_Y, P_DESC(ST_SHEAR_Y)),
 		};
 		for (auto kv : entries) {
-			p = obs_properties_add_float_slider(pr, kv.first,
-				P_TRANSLATE(kv.first), -100.0, 100.0, 0.01);
-			obs_property_set_long_description(p,
-				P_TRANSLATE(kv.second));
+			p = obs_properties_add_float_slider(pr, kv.first, P_TRANSLATE(kv.first), -100.0, 100.0, 0.01);
+			obs_property_set_long_description(p, P_TRANSLATE(kv.second));
 		}
 	}
 
 	p = obs_properties_add_bool(pr, S_ADVANCED, P_TRANSLATE(S_ADVANCED));
 	obs_property_set_modified_callback(p, modified_properties);
 
-	p = obs_properties_add_list(pr, ST_ROTATION_ORDER,
-		P_TRANSLATE(ST_ROTATION_ORDER), OBS_COMBO_TYPE_LIST,
-		OBS_COMBO_FORMAT_INT);
-	obs_property_set_long_description(p,
-		P_TRANSLATE(P_DESC(ST_ROTATION_ORDER)));
-	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_XYZ),
-		RotationOrder::XYZ);
-	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_XZY),
-		RotationOrder::XZY);
-	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_YXZ),
-		RotationOrder::YXZ);
-	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_YZX),
-		RotationOrder::YZX);
-	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_ZXY),
-		RotationOrder::ZXY);
-	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_ZYX),
-		RotationOrder::ZYX);
-
+	p = obs_properties_add_list(pr, ST_ROTATION_ORDER, P_TRANSLATE(ST_ROTATION_ORDER), OBS_COMBO_TYPE_LIST,
+								OBS_COMBO_FORMAT_INT);
+	obs_property_set_long_description(p, P_TRANSLATE(P_DESC(ST_ROTATION_ORDER)));
+	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_XYZ), RotationOrder::XYZ);
+	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_XZY), RotationOrder::XZY);
+	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_YXZ), RotationOrder::YXZ);
+	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_YZX), RotationOrder::YZX);
+	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_ZXY), RotationOrder::ZXY);
+	obs_property_list_add_int(p, P_TRANSLATE(ST_ROTATION_ORDER_ZYX), RotationOrder::ZYX);
 
 	return pr;
 }
 
-bool Filter::Transform::modified_properties(obs_properties_t *pr,
-	obs_property_t *, obs_data_t *d) {
+bool Filter::Transform::modified_properties(obs_properties_t* pr, obs_property_t*, obs_data_t* d)
+{
 	switch ((CameraMode)obs_data_get_int(d, ST_CAMERA)) {
-		case CameraMode::Orthographic:
-			obs_property_set_visible(obs_properties_get(pr,
-				ST_CAMERA_FIELDOFVIEW), false);
-			obs_property_set_visible(obs_properties_get(pr,
-				ST_POSITION_Z), false);
-			break;
-		case CameraMode::Perspective:
-			obs_property_set_visible(obs_properties_get(pr,
-				ST_CAMERA_FIELDOFVIEW), true);
-			obs_property_set_visible(obs_properties_get(pr,
-				ST_POSITION_Z), true);
-			break;
+	case CameraMode::Orthographic:
+		obs_property_set_visible(obs_properties_get(pr, ST_CAMERA_FIELDOFVIEW), false);
+		obs_property_set_visible(obs_properties_get(pr, ST_POSITION_Z), false);
+		break;
+	case CameraMode::Perspective:
+		obs_property_set_visible(obs_properties_get(pr, ST_CAMERA_FIELDOFVIEW), true);
+		obs_property_set_visible(obs_properties_get(pr, ST_POSITION_Z), true);
+		break;
 	}
 
 	bool advancedVisible = obs_data_get_bool(d, S_ADVANCED);
-	obs_property_set_visible(obs_properties_get(pr,
-		ST_ROTATION_ORDER), advancedVisible);
+	obs_property_set_visible(obs_properties_get(pr, ST_ROTATION_ORDER), advancedVisible);
 
 	return true;
 }
 
-void * Filter::Transform::create(obs_data_t *data, obs_source_t *source) {
+void* Filter::Transform::create(obs_data_t* data, obs_source_t* source)
+{
 	return new Instance(data, source);
 }
 
-void Filter::Transform::destroy(void *ptr) {
+void Filter::Transform::destroy(void* ptr)
+{
 	delete reinterpret_cast<Instance*>(ptr);
 }
 
-uint32_t Filter::Transform::get_width(void *ptr) {
+uint32_t Filter::Transform::get_width(void* ptr)
+{
 	return reinterpret_cast<Instance*>(ptr)->get_width();
 }
 
-uint32_t Filter::Transform::get_height(void *ptr) {
+uint32_t Filter::Transform::get_height(void* ptr)
+{
 	return reinterpret_cast<Instance*>(ptr)->get_height();
 }
 
-void Filter::Transform::update(void *ptr, obs_data_t *data) {
+void Filter::Transform::update(void* ptr, obs_data_t* data)
+{
 	reinterpret_cast<Instance*>(ptr)->update(data);
 }
 
-void Filter::Transform::activate(void *ptr) {
+void Filter::Transform::activate(void* ptr)
+{
 	reinterpret_cast<Instance*>(ptr)->activate();
 }
 
-void Filter::Transform::deactivate(void *ptr) {
+void Filter::Transform::deactivate(void* ptr)
+{
 	reinterpret_cast<Instance*>(ptr)->deactivate();
 }
 
-void Filter::Transform::video_tick(void *ptr, float time) {
+void Filter::Transform::video_tick(void* ptr, float time)
+{
 	reinterpret_cast<Instance*>(ptr)->video_tick(time);
 }
 
-void Filter::Transform::video_render(void *ptr, gs_effect_t *effect) {
+void Filter::Transform::video_render(void* ptr, gs_effect_t* effect)
+{
 	reinterpret_cast<Instance*>(ptr)->video_render(effect);
 }
 
-Filter::Transform::Instance::Instance(obs_data_t *data, obs_source_t *context) :
-	m_sourceContext(context), m_vertexHelper(nullptr),
-	m_vertexBuffer(nullptr), m_texRender(nullptr), m_shapeRender(nullptr),
-	m_isCameraOrthographic(true), m_cameraFieldOfView(90.0),
-	m_isInactive(false), m_isHidden(false), m_isMeshUpdateRequired(false),
-	m_rotationOrder(RotationOrder::ZXY) {
+Filter::Transform::Instance::Instance(obs_data_t* data, obs_source_t* context)
+	: m_sourceContext(context), m_vertexHelper(nullptr), m_vertexBuffer(nullptr), m_texRender(nullptr),
+	  m_shapeRender(nullptr), m_isCameraOrthographic(true), m_cameraFieldOfView(90.0), m_isInactive(false),
+	  m_isHidden(false), m_isMeshUpdateRequired(false), m_rotationOrder(RotationOrder::ZXY)
+{
 	m_position = std::make_unique<util::vec3a>();
 	m_rotation = std::make_unique<util::vec3a>();
-	m_scale = std::make_unique<util::vec3a>();
-	m_shear = std::make_unique<util::vec3a>();
+	m_scale    = std::make_unique<util::vec3a>();
+	m_shear    = std::make_unique<util::vec3a>();
 
 	vec3_set(m_position.get(), 0, 0, 0);
 	vec3_set(m_rotation.get(), 0, 0, 0);
 	vec3_set(m_scale.get(), 1, 1, 1);
 
 	obs_enter_graphics();
-	m_texRender = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
-	m_shapeRender = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
+	m_texRender    = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
+	m_shapeRender  = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
 	m_vertexHelper = new gs::vertex_buffer(4);
 	m_vertexHelper->set_uv_layers(1);
 	m_vertexHelper->resize(4);
@@ -312,7 +291,8 @@ Filter::Transform::Instance::Instance(obs_data_t *data, obs_source_t *context) :
 	update(data);
 }
 
-Filter::Transform::Instance::~Instance() {
+Filter::Transform::Instance::~Instance()
+{
 	obs_enter_graphics();
 	delete m_vertexHelper;
 	gs_texrender_destroy(m_texRender);
@@ -320,64 +300,65 @@ Filter::Transform::Instance::~Instance() {
 	obs_leave_graphics();
 }
 
-void Filter::Transform::Instance::update(obs_data_t *data) {
+void Filter::Transform::Instance::update(obs_data_t* data)
+{
 	// Camera
 	m_isCameraOrthographic = obs_data_get_int(data, ST_CAMERA) == 0;
-	m_cameraFieldOfView = (float)obs_data_get_double(data,
-		ST_CAMERA_FIELDOFVIEW);
+	m_cameraFieldOfView    = (float)obs_data_get_double(data, ST_CAMERA_FIELDOFVIEW);
 
 	// Source
-	m_position->x = (float)obs_data_get_double(data, ST_POSITION_X) / 100.0f;
-	m_position->y = (float)obs_data_get_double(data, ST_POSITION_Y) / 100.0f;
-	m_position->z = (float)obs_data_get_double(data, ST_POSITION_Z) / 100.0f;
-	m_scale->x = (float)obs_data_get_double(data, ST_SCALE_X) / 100.0f;
-	m_scale->y = (float)obs_data_get_double(data, ST_SCALE_Y) / 100.0f;
-	m_scale->z = 1.0f;
-	m_rotationOrder = (int)obs_data_get_int(data, ST_ROTATION_ORDER);
-	m_rotation->x = (float)(obs_data_get_double(data, ST_ROTATION_X) / 180.0f * PI);
-	m_rotation->y = (float)(obs_data_get_double(data, ST_ROTATION_Y) / 180.0f * PI);
-	m_rotation->z = (float)(obs_data_get_double(data, ST_ROTATION_Z) / 180.0f * PI);
-	m_shear->x = (float)obs_data_get_double(data, ST_SHEAR_X) / 100.0f;
-	m_shear->y = (float)obs_data_get_double(data, ST_SHEAR_Y) / 100.0f;
-	m_shear->z = 0.0f;
+	m_position->x          = (float)obs_data_get_double(data, ST_POSITION_X) / 100.0f;
+	m_position->y          = (float)obs_data_get_double(data, ST_POSITION_Y) / 100.0f;
+	m_position->z          = (float)obs_data_get_double(data, ST_POSITION_Z) / 100.0f;
+	m_scale->x             = (float)obs_data_get_double(data, ST_SCALE_X) / 100.0f;
+	m_scale->y             = (float)obs_data_get_double(data, ST_SCALE_Y) / 100.0f;
+	m_scale->z             = 1.0f;
+	m_rotationOrder        = (int)obs_data_get_int(data, ST_ROTATION_ORDER);
+	m_rotation->x          = (float)(obs_data_get_double(data, ST_ROTATION_X) / 180.0f * PI);
+	m_rotation->y          = (float)(obs_data_get_double(data, ST_ROTATION_Y) / 180.0f * PI);
+	m_rotation->z          = (float)(obs_data_get_double(data, ST_ROTATION_Z) / 180.0f * PI);
+	m_shear->x             = (float)obs_data_get_double(data, ST_SHEAR_X) / 100.0f;
+	m_shear->y             = (float)obs_data_get_double(data, ST_SHEAR_Y) / 100.0f;
+	m_shear->z             = 0.0f;
 	m_isMeshUpdateRequired = true;
 }
 
-uint32_t Filter::Transform::Instance::get_width() {
+uint32_t Filter::Transform::Instance::get_width()
+{
 	return 0;
 }
 
-uint32_t Filter::Transform::Instance::get_height() {
+uint32_t Filter::Transform::Instance::get_height()
+{
 	return 0;
 }
 
-void Filter::Transform::Instance::activate() {
+void Filter::Transform::Instance::activate()
+{
 	m_isInactive = false;
 }
 
-void Filter::Transform::Instance::deactivate() {
+void Filter::Transform::Instance::deactivate()
+{
 	m_isInactive = true;
 }
 
 void Filter::Transform::Instance::video_tick(float) {}
 
-void Filter::Transform::Instance::video_render(gs_effect_t *paramEffect) {
-	obs_source_t *parent = obs_filter_get_parent(m_sourceContext);
-	obs_source_t *target = obs_filter_get_target(m_sourceContext);
-	uint32_t
-		baseW = obs_source_get_base_width(target),
-		baseH = obs_source_get_base_height(target);
+void Filter::Transform::Instance::video_render(gs_effect_t* paramEffect)
+{
+	obs_source_t* parent = obs_filter_get_parent(m_sourceContext);
+	obs_source_t* target = obs_filter_get_target(m_sourceContext);
+	uint32_t      baseW = obs_source_get_base_width(target), baseH = obs_source_get_base_height(target);
 
 	// Skip rendering if our target, parent or context is not valid.
-	if (!target || !parent || !m_sourceContext
-		|| !baseW || !baseH
-		|| !m_texRender || !m_shapeRender
-		|| m_isInactive || m_isHidden) {
+	if (!target || !parent || !m_sourceContext || !baseW || !baseH || !m_texRender || !m_shapeRender || m_isInactive
+		|| m_isHidden) {
 		obs_source_skip_video_filter(m_sourceContext);
 		return;
 	}
 
-	gs_effect_t *alphaEffect = obs_get_base_effect(OBS_EFFECT_DEFAULT);
+	gs_effect_t* alphaEffect = obs_get_base_effect(OBS_EFFECT_DEFAULT);
 
 	// Draw previous filters to texture.
 	gs_texrender_reset(m_texRender);
@@ -393,22 +374,16 @@ void Filter::Transform::Instance::video_render(gs_effect_t *paramEffect) {
 	gs_clear(GS_CLEAR_COLOR | GS_CLEAR_DEPTH, &black, 0, 0);
 	gs_set_cull_mode(GS_NEITHER);
 	gs_reset_blend_state();
-	gs_blend_function_separate(
-		gs_blend_type::GS_BLEND_ONE,
-		gs_blend_type::GS_BLEND_ZERO,
-		gs_blend_type::GS_BLEND_ONE,
-		gs_blend_type::GS_BLEND_ZERO);
+	gs_blend_function_separate(gs_blend_type::GS_BLEND_ONE, gs_blend_type::GS_BLEND_ZERO, gs_blend_type::GS_BLEND_ONE,
+							   gs_blend_type::GS_BLEND_ZERO);
 	gs_enable_depth_test(false);
 	gs_enable_stencil_test(false);
 	gs_enable_stencil_write(false);
 	gs_enable_color(true, true, true, true);
 
 	/// Render original source
-	if (obs_source_process_filter_begin(m_sourceContext, GS_RGBA,
-		OBS_NO_DIRECT_RENDERING)) {
-		obs_source_process_filter_end(m_sourceContext,
-			paramEffect ? paramEffect : alphaEffect,
-			baseW, baseH);
+	if (obs_source_process_filter_begin(m_sourceContext, GS_RGBA, OBS_NO_DIRECT_RENDERING)) {
+		obs_source_process_filter_end(m_sourceContext, paramEffect ? paramEffect : alphaEffect, baseW, baseH);
 	} else {
 		obs_source_skip_video_filter(m_sourceContext);
 	}
@@ -426,36 +401,36 @@ void Filter::Transform::Instance::video_render(gs_effect_t *paramEffect) {
 		matrix4 ident;
 		matrix4_identity(&ident);
 		switch (m_rotationOrder) {
-			case RotationOrder::XYZ: // XYZ
-				matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
-				matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
-				matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
-				break;
-			case RotationOrder::XZY: // XZY
-				matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
-				matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
-				matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
-				break;
-			case RotationOrder::YXZ: // YXZ
-				matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
-				matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
-				matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
-				break;
-			case RotationOrder::YZX: // YZX
-				matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
-				matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
-				matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
-				break;
-			case RotationOrder::ZXY: // ZXY
-				matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
-				matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
-				matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
-				break;
-			case RotationOrder::ZYX: // ZYX
-				matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
-				matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
-				matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
-				break;
+		case RotationOrder::XYZ: // XYZ
+			matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
+			matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
+			matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
+			break;
+		case RotationOrder::XZY: // XZY
+			matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
+			matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
+			matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
+			break;
+		case RotationOrder::YXZ: // YXZ
+			matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
+			matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
+			matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
+			break;
+		case RotationOrder::YZX: // YZX
+			matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
+			matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
+			matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
+			break;
+		case RotationOrder::ZXY: // ZXY
+			matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
+			matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
+			matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
+			break;
+		case RotationOrder::ZYX: // ZYX
+			matrix4_rotate_aa4f(&ident, &ident, 0, 0, 1, m_rotation->z);
+			matrix4_rotate_aa4f(&ident, &ident, 0, 1, 0, m_rotation->y);
+			matrix4_rotate_aa4f(&ident, &ident, 1, 0, 0, m_rotation->x);
+			break;
 		}
 		matrix4_translate3f(&ident, &ident, m_position->x, m_position->y, m_position->z);
 
@@ -466,38 +441,30 @@ void Filter::Transform::Instance::video_render(gs_effect_t *paramEffect) {
 		/// Generate mesh
 		{
 			gs::vertex vtx = m_vertexHelper->at(0);
-			*vtx.color = 0xFFFFFFFF;
+			*vtx.color     = 0xFFFFFFFF;
 			vec4_set(vtx.uv[0], 0, 0, 0, 0);
-			vec3_set(vtx.position, 
-				-p_x + m_shear->x, 
-				-p_y - m_shear->y, 0);
+			vec3_set(vtx.position, -p_x + m_shear->x, -p_y - m_shear->y, 0);
 			vec3_transform(vtx.position, vtx.position, &ident);
 		}
 		{
 			gs::vertex vtx = m_vertexHelper->at(1);
-			*vtx.color = 0xFFFFFFFF;
+			*vtx.color     = 0xFFFFFFFF;
 			vec4_set(vtx.uv[0], 1, 0, 0, 0);
-			vec3_set(vtx.position,
-				p_x + m_shear->x,
-				-p_y + m_shear->y, 0);
+			vec3_set(vtx.position, p_x + m_shear->x, -p_y + m_shear->y, 0);
 			vec3_transform(vtx.position, vtx.position, &ident);
 		}
 		{
 			gs::vertex vtx = m_vertexHelper->at(2);
-			*vtx.color = 0xFFFFFFFF;
+			*vtx.color     = 0xFFFFFFFF;
 			vec4_set(vtx.uv[0], 0, 1, 0, 0);
-			vec3_set(vtx.position,
-				-p_x - m_shear->x,
-				p_y - m_shear->y, 0);
+			vec3_set(vtx.position, -p_x - m_shear->x, p_y - m_shear->y, 0);
 			vec3_transform(vtx.position, vtx.position, &ident);
 		}
 		{
 			gs::vertex vtx = m_vertexHelper->at(3);
-			*vtx.color = 0xFFFFFFFF;
+			*vtx.color     = 0xFFFFFFFF;
 			vec4_set(vtx.uv[0], 1, 1, 0, 0);
-			vec3_set(vtx.position,
-				p_x - m_shear->x,
-				p_y + m_shear->y, 0);
+			vec3_set(vtx.position, p_x - m_shear->x, p_y + m_shear->y, 0);
 			vec3_transform(vtx.position, vtx.position, &ident);
 		}
 
@@ -515,8 +482,7 @@ void Filter::Transform::Instance::video_render(gs_effect_t *paramEffect) {
 		if (m_isCameraOrthographic) {
 			gs_ortho(-1.0, 1.0, -1.0, 1.0, -farZ, farZ);
 		} else {
-			gs_perspective(m_cameraFieldOfView,
-				float_t(baseW) / float_t(baseH), nearZ, farZ);
+			gs_perspective(m_cameraFieldOfView, float_t(baseW) / float_t(baseH), nearZ, farZ);
 			// Fix camera pointing at -Z instead of +Z.
 			gs_matrix_scale3f(1.0, 1.0, -1.0);
 			// Move backwards so we can actually see stuff.
@@ -535,9 +501,7 @@ void Filter::Transform::Instance::video_render(gs_effect_t *paramEffect) {
 		gs_enable_stencil_write(false);
 		gs_enable_color(true, true, true, true);
 		while (gs_effect_loop(alphaEffect, "Draw")) {
-			gs_effect_set_texture(
-				gs_effect_get_param_by_name(alphaEffect,
-					"image"), filterTexture);
+			gs_effect_set_texture(gs_effect_get_param_by_name(alphaEffect, "image"), filterTexture);
 			gs_load_vertexbuffer(m_vertexBuffer);
 			gs_load_indexbuffer(NULL);
 			gs_draw(GS_TRISTRIP, 0, 4);
@@ -554,8 +518,7 @@ void Filter::Transform::Instance::video_render(gs_effect_t *paramEffect) {
 	gs_reset_blend_state();
 	gs_enable_depth_test(false);
 	while (gs_effect_loop(alphaEffect, "Draw")) {
-		gs_effect_set_texture(gs_effect_get_param_by_name(alphaEffect,
-			"image"), shapeTexture);
+		gs_effect_set_texture(gs_effect_get_param_by_name(alphaEffect, "image"), shapeTexture);
 		gs_draw_sprite(shapeTexture, 0, 0, 0);
 	}
 }
diff --git a/source/filter-transform.h b/source/filter-transform.h
index 674c4c5..3241f61 100644
--- a/source/filter-transform.h
+++ b/source/filter-transform.h
@@ -18,9 +18,9 @@
  */
 
 #pragma once
-#include "plugin.h"
-#include "gs-vertexbuffer.h"
 #include <memory>
+#include "gs-vertexbuffer.h"
+#include "plugin.h"
 
 namespace Filter {
 	class Transform {
@@ -28,23 +28,22 @@ namespace Filter {
 		Transform();
 		~Transform();
 
-		static const char *get_name(void *);
-		static void get_defaults(obs_data_t *);
-		static obs_properties_t *get_properties(void *);
-		static bool modified_properties(obs_properties_t *,
-			obs_property_t *, obs_data_t *);
+		static const char*       get_name(void*);
+		static void              get_defaults(obs_data_t*);
+		static obs_properties_t* get_properties(void*);
+		static bool              modified_properties(obs_properties_t*, obs_property_t*, obs_data_t*);
 
-		static void *create(obs_data_t *, obs_source_t *);
-		static void destroy(void *);
-		static uint32_t get_width(void *);
-		static uint32_t get_height(void *);
-		static void update(void *, obs_data_t *);
-		static void activate(void *);
-		static void deactivate(void *);
-		static void show(void *);
-		static void hide(void *);
-		static void video_tick(void *, float);
-		static void video_render(void *, gs_effect_t *);
+		static void*    create(obs_data_t*, obs_source_t*);
+		static void     destroy(void*);
+		static uint32_t get_width(void*);
+		static uint32_t get_height(void*);
+		static void     update(void*, obs_data_t*);
+		static void     activate(void*);
+		static void     deactivate(void*);
+		static void     show(void*);
+		static void     hide(void*);
+		static void     video_tick(void*, float);
+		static void     video_render(void*, gs_effect_t*);
 
 		private:
 		obs_source_info sourceInfo;
@@ -55,22 +54,22 @@ namespace Filter {
 			Instance(obs_data_t*, obs_source_t*);
 			~Instance();
 
-			void update(obs_data_t*);
+			void     update(obs_data_t*);
 			uint32_t get_width();
 			uint32_t get_height();
-			void activate();
-			void deactivate();
-			void video_tick(float);
-			void video_render(gs_effect_t*);
+			void     activate();
+			void     deactivate();
+			void     video_tick(float);
+			void     video_render(gs_effect_t*);
 
 			private:
-			obs_source_t *m_sourceContext;
-			gs::vertex_buffer *m_vertexHelper;
-			gs_vertbuffer_t *m_vertexBuffer;
-			gs_texrender_t *m_texRender, *m_shapeRender;
+			obs_source_t*      m_sourceContext;
+			gs::vertex_buffer* m_vertexHelper;
+			gs_vertbuffer_t*   m_vertexBuffer;
+			gs_texrender_t *   m_texRender, *m_shapeRender;
 
 			// Camera
-			bool m_isCameraOrthographic;
+			bool    m_isCameraOrthographic;
 			float_t m_cameraFieldOfView;
 
 			// Source
@@ -87,4 +86,4 @@ namespace Filter {
 			};
 		};
 	};
-}
+} // namespace Filter