From ed27ab2e6bbe40120702dcc57e9b21434bfb4944 Mon Sep 17 00:00:00 2001 From: Fox Caminiti Date: Sat, 3 Dec 2022 21:57:53 -0500 Subject: v2.0, effects functional --- effects_constructors.cpp | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'effects_constructors.cpp') diff --git a/effects_constructors.cpp b/effects_constructors.cpp index 7eb2143..406cb08 100644 --- a/effects_constructors.cpp +++ b/effects_constructors.cpp @@ -67,16 +67,6 @@ static void Effect_InitEntries(project_state *State) { /* - Effect_AddEntry(State, "Levels", "LVLS", &Effect_Levels, effect_display_type_levels); - // Levels - // min/max is handled by the UI - Effect_AddProperty_Real(State, "All start point", 0.0f); - Effect_AddProperty_Real(State, "All mid point", 1.0f); - Effect_AddProperty_Real(State, "All end point", 1.0f); - Effect_AddProperty_Col(State, "Channel start point", V4(0.0f)); - Effect_AddProperty_Col(State, "Channel mid point", V4(1.0f)); - Effect_AddProperty_Col(State, "Channel end point", V4(1.0f)); - Effect_EndEntry(State); */ // Curves /* @@ -90,20 +80,35 @@ Effect_InitEntries(project_state *State) } Effect_EndEntry(State); */ + // Solid color - Effect_AddEntry(State, "Solid color", "REALSCOL", Effect_DrawColor, GLShader_SolidColor); + Effect_AddEntry(State, "Solid color", "REALSCOL", &Effect_DrawColor, GLShader_SolidColor); Effect_AddProperty_Col(State, "Color", V4(0.3f, 0.2f, 0.6f, 1.0f)); - Effect_AddProperty_Blendmode(State, "Blend mode", blend_softlight); Effect_EndEntry(State); + // Gaussian blur Effect_AddEntry(State, "Gaussian blur", "REALGBLR", &Effect_GaussianBlur, GLShader_GaussianBlur); Effect_AddProperty_Real(State, "Radius", 1.0f, 0.0f, 200.0f); Effect_EndEntry(State); - /* + + // Curves Effect_AddEntry(State, "Curves", "REALCRVS", &Effect_Curves, NULL, effect_display_type_curves); for (int i = 0; i < MAX_PROPERTIES_PER_EFFECT; i++) { Effect_AddProperty_Real(State, "point", 0.0f); } + Effect_EndEntry(State); + + // Levels + Effect_AddEntry(State, "Levels", "REALLVLS", &Effect_Levels, GLShader_Levels, effect_display_type_levels); + // min/max is handled by the UI + Effect_AddProperty_Real(State, "All start point", 0.0f); + Effect_AddProperty_Real(State, "All mid point", 1.0f); + Effect_AddProperty_Real(State, "All end point", 1.0f); + Effect_AddProperty_Col(State, "Channel start point", V4(0.0f)); + Effect_AddProperty_Col(State, "Channel mid point", V4(1.0f)); + Effect_AddProperty_Col(State, "Channel end point", V4(1.0f)); + Effect_EndEntry(State); + /* // Test gradient Effect_AddEntry(State, "Test gradient", "REALTGRD", &Effect_TestGradient, NULL); Effect_AddProperty_Col(State, "Color", V4(0.3f, 0.2f, 0.6f, 1.0f)); -- cgit v1.2.3