shweet/anm2ed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OH SHIT ROOT FRAME TINT/COLOR OFFSET!

Browse Source
This commit is contained in:
shweet
2025-12-16 20:18:49 -05:00
parent 4e1226739a
commit 4cf5304c79
3 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/imgui/window/animation_preview.cpp
View File

@@ -555,8 +555,9 @@ namespace anm2ed::imgui
auto uvMin = frame.crop / texSize; auto uvMin = frame.crop / texSize;
auto uvMax = (frame.crop + frame.size) / texSize; auto uvMax = (frame.crop + frame.size) / texSize;
vec3 frameColorOffset = frame.colorOffset + colorOffset + sampleColor; auto rootFrame = animation->rootAnimation.frame_generate(sampleTime, anm2::ROOT);
vec4 frameTint = frame.tint; vec3 frameColorOffset = frame.colorOffset + rootFrame.colorOffset + colorOffset + sampleColor;
vec4 frameTint = frame.tint * rootFrame.tint;
frameTint.a = std::max(0.0f, frameTint.a - (alphaOffset + sampleAlpha)); frameTint.a = std::max(0.0f, frameTint.a - (alphaOffset + sampleAlpha));
auto vertices = math::uv_vertices_get(uvMin, uvMax); auto vertices = math::uv_vertices_get(uvMin, uvMax);

40
src/imgui/window/frame_properties.cpp
View File

@@ -182,6 +182,8 @@ namespace anm2ed::imgui
else else
{ {
auto& isCrop = settings.changeIsCrop; auto& isCrop = settings.changeIsCrop;
auto& isCropX = settings.changeIsCropX;
auto& isCropY = settings.changeIsCropY;
auto& isSize = settings.changeIsSize; auto& isSize = settings.changeIsSize;
auto& isPosition = settings.changeIsPosition; auto& isPosition = settings.changeIsPosition;
auto& isPivot = settings.changeIsPivot; auto& isPivot = settings.changeIsPivot;
@@ -204,7 +206,7 @@ namespace anm2ed::imgui
auto& isVisible = settings.changeIsVisible; auto& isVisible = settings.changeIsVisible;
auto& isInterpolated = settings.changeIsInterpolated; auto& isInterpolated = settings.changeIsInterpolated;
#define PROPERTIES_WIDGET(body) \ #define PROPERTIES_WIDGET(body, checkboxLabel, isEnabled) \
ImGui::Checkbox(checkboxLabel, &isEnabled); \ ImGui::Checkbox(checkboxLabel, &isEnabled); \
ImGui::SameLine(); \ ImGui::SameLine(); \
ImGui::BeginDisabled(!isEnabled); \ ImGui::BeginDisabled(!isEnabled); \
@@ -212,29 +214,51 @@ namespace anm2ed::imgui
ImGui::EndDisabled(); ImGui::EndDisabled();
auto bool_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, bool& value) auto bool_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, bool& value)
{ PROPERTIES_WIDGET(ImGui::Checkbox(valueLabel, &value)); }; { PROPERTIES_WIDGET(ImGui::Checkbox(valueLabel, &value), checkboxLabel, isEnabled) };
auto color3_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, vec3& value) auto color3_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, vec3& value)
{ PROPERTIES_WIDGET(ImGui::ColorEdit3(valueLabel, value_ptr(value))); }; { PROPERTIES_WIDGET(ImGui::ColorEdit3(valueLabel, value_ptr(value)), checkboxLabel, isEnabled); };
auto color4_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, vec4& value) auto color4_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, vec4& value)
{ PROPERTIES_WIDGET(ImGui::ColorEdit4(valueLabel, value_ptr(value))); }; { PROPERTIES_WIDGET(ImGui::ColorEdit4(valueLabel, value_ptr(value)), checkboxLabel, isEnabled); };
auto float2_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, vec2& value) auto float2_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, vec2& value)
{ PROPERTIES_WIDGET(ImGui::InputFloat2(valueLabel, value_ptr(value), vec2_format_get(value))); }; {
PROPERTIES_WIDGET(ImGui::InputFloat2(valueLabel, value_ptr(value), vec2_format_get(value)), checkboxLabel,
isEnabled);
};
auto float2_value_new = [&](const char* checkboxXLabel, const char* checkboxYLabel, const char* valueXLabel,
const char* valueYLabel, bool& isXEnabled, bool& isYEnabled, vec2& value)
{
auto width =
(ImGui::CalcItemWidth() - ImGui::GetTextLineHeight() - (ImGui::GetStyle().ItemInnerSpacing.x * 6)) / 2;
PROPERTIES_WIDGET(ImGui::PushItemWidth(width);
ImGui::DragFloat(valueXLabel, &value.x, DRAG_SPEED, 0.0f, 0.0f, float_format_get(value.x));
ImGui::PopItemWidth(), checkboxXLabel, isXEnabled);
ImGui::SameLine();
PROPERTIES_WIDGET(ImGui::PushItemWidth(width);
ImGui::DragFloat(valueYLabel, &value.y, DRAG_SPEED, 0.0f, 0.0f, float_format_get(value.y));
ImGui::PopItemWidth(), checkboxYLabel, isYEnabled);
};
auto float_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, float& value) auto float_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, float& value)
{ PROPERTIES_WIDGET(ImGui::InputFloat(valueLabel, &value, STEP, STEP_FAST, float_format_get(value))); }; {
PROPERTIES_WIDGET(ImGui::InputFloat(valueLabel, &value, STEP, STEP_FAST, float_format_get(value)),
checkboxLabel, isEnabled);
};
auto duration_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, int& value) auto duration_value = [&](const char* checkboxLabel, const char* valueLabel, bool& isEnabled, int& value)
{ {
PROPERTIES_WIDGET( PROPERTIES_WIDGET(
input_int_range(valueLabel, value, anm2::FRAME_DURATION_MIN, anm2::FRAME_DURATION_MAX, STEP, STEP_FAST)); input_int_range(valueLabel, value, anm2::FRAME_DURATION_MIN, anm2::FRAME_DURATION_MAX, STEP, STEP_FAST),
checkboxLabel, isEnabled);
}; };
#undef PROPERTIES_WIDGET #undef PROPERTIES_WIDGET
float2_value("##Is Crop", localize.get(BASIC_CROP), isCrop, crop); float2_value_new("##Is Crop X", "##Is Crop Y", "##Crop X", localize.get(BASIC_CROP), isCropX, isCropY, crop);
float2_value("##Is Size", localize.get(BASIC_SIZE), isSize, size); float2_value("##Is Size", localize.get(BASIC_SIZE), isSize, size);
float2_value("##Is Position", localize.get(BASIC_POSITION), isPosition, position); float2_value("##Is Position", localize.get(BASIC_POSITION), isPosition, position);
float2_value("##Is Pivot", localize.get(BASIC_PIVOT), isPivot, pivot); float2_value("##Is Pivot", localize.get(BASIC_PIVOT), isPivot, pivot);

10
src/settings.h
View File

@@ -70,10 +70,20 @@ namespace anm2ed
X(PLAYBACK_IS_CLAMP, playbackIsClamp, STRING_UNDEFINED, BOOL, true) \ X(PLAYBACK_IS_CLAMP, playbackIsClamp, STRING_UNDEFINED, BOOL, true) \
\ \
X(CHANGE_IS_CROP, changeIsCrop, STRING_UNDEFINED, BOOL, false) \ X(CHANGE_IS_CROP, changeIsCrop, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_CROP_X, changeIsCropX, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_CROP_Y, changeIsCropY, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_SIZE, changeIsSize, STRING_UNDEFINED, BOOL, false) \ X(CHANGE_IS_SIZE, changeIsSize, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_SIZE_X, changeIsSizeX, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_SIZE_Y, changeIsSizeY, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_POSITION, changeIsPosition, STRING_UNDEFINED, BOOL, false) \ X(CHANGE_IS_POSITION, changeIsPosition, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_POSITION_X, changeIsPositionX, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_POSITION_Y, changeIsPositionY, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_PIVOT, changeIsPivot, STRING_UNDEFINED, BOOL, false) \ X(CHANGE_IS_PIVOT, changeIsPivot, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_PIVOT_X, changeIsPivotX, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_PIVOT_Y, changeIsPivotY, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_SCALE, changeIsScale, STRING_UNDEFINED, BOOL, false) \ X(CHANGE_IS_SCALE, changeIsScale, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_SCALE_X, changeIsScaleX, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_SCALE_Y, changeIsScaleY, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_ROTATION, changeIsRotation, STRING_UNDEFINED, BOOL, false) \ X(CHANGE_IS_ROTATION, changeIsRotation, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_DURATION, changeIsDuration, STRING_UNDEFINED, BOOL, false) \ X(CHANGE_IS_DURATION, changeIsDuration, STRING_UNDEFINED, BOOL, false) \
X(CHANGE_IS_TINT, changeIsTint, STRING_UNDEFINED, BOOL, false) \ X(CHANGE_IS_TINT, changeIsTint, STRING_UNDEFINED, BOOL, false) \