3party/raygui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

RENAMED gui module for consistency

Browse Source
This commit is contained in:
Ray 2023-06-17 17:03:36 +02:00
parent b6db462f72
commit 7f70abc5db
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/animation_curve/animation_curve.c
View File

@ -31,8 +31,8 @@
#undef RAYGUI_IMPLEMENTATION // Avoid including raygui implementation again #undef RAYGUI_IMPLEMENTATION // Avoid including raygui implementation again
#define GUI_CURVE_EDIT_IMPLEMENTATION #define GUI_CURVE_EDITOR_IMPLEMENTATION
#include "gui_curve_edit.h" #include "gui_curve_editor.h"
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
// Helper function // Helper function

33
examples/animation_curve/gui_curve_edit.h → examples/animation_curve/gui_curve_editor.h
View File

@ -3,7 +3,7 @@
* CurveEdit v1.0 - A cubic Hermite editor for making animation curves * CurveEdit v1.0 - A cubic Hermite editor for making animation curves
* *
* MODULE USAGE: * MODULE USAGE:
* #define GUI_CURVE_EDIT_IMPLEMENTATION * #define GUI_CURVE_EDITOR_IMPLEMENTATION
* #include "gui_curve_edit.h" * #include "gui_curve_edit.h"
* *
* INIT: GuiCurveEditState state = InitCurveEdit(); * INIT: GuiCurveEditState state = InitCurveEdit();
@ -46,12 +46,12 @@
#include "raylib.h" #include "raylib.h"
#ifndef GUI_CURVE_EDIT_H #ifndef GUI_CURVE_EDITOR_H
#define GUI_CURVE_EDIT_H #define GUI_CURVE_EDITOR_H
#ifndef GUI_CURVE_EDIT_MAX_POINTS #ifndef GUI_CURVE_EDITOR_MAX_POINTS
#define GUI_CURVE_EDIT_MAX_POINTS 30 #define GUI_CURVE_EDITOR_MAX_POINTS 30
#endif #endif
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
@ -75,7 +75,7 @@ typedef struct {
int selectedIndex; int selectedIndex;
// Unsorted array with at least one point (constant curve) // Unsorted array with at least one point (constant curve)
GuiCurveEditorPoint points[GUI_CURVE_EDIT_MAX_POINTS]; GuiCurveEditorPoint points[GUI_CURVE_EDITOR_MAX_POINTS];
int numPoints; int numPoints;
// Private variables // Private variables
@ -92,9 +92,7 @@ extern "C" { // Prevents name mangling of functions
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Module Functions Declaration // Module Functions Declaration
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
GuiCurveEditorState InitGuiCurveEditor(); // Initialize curve editor state
GuiCurveEditorState GuiInitCurveEditor(); // Initialize curve editor state
void GuiCurveEditor(GuiCurveEditorState *state, Rectangle bounds); // Draw and update curve control void GuiCurveEditor(GuiCurveEditorState *state, Rectangle bounds); // Draw and update curve control
// 1D Interpolation // 1D Interpolation
@ -106,14 +104,14 @@ float GuiCurveEval(GuiCurveEditorState *state, float t);
} }
#endif #endif
#endif // GUI_CURVE_EDIT_H #endif // GUI_CURVE_EDITOR_H
/*********************************************************************************** /***********************************************************************************
* *
* GUI_CURVE_EDIT IMPLEMENTATION * GUI_CURVE_EDITOR IMPLEMENTATION
* *
************************************************************************************/ ************************************************************************************/
#if defined(GUI_CURVE_EDIT_IMPLEMENTATION) #if defined(GUI_CURVE_EDITOR_IMPLEMENTATION)
#include "../../src/raygui.h" // Change this to fit your project #include "../../src/raygui.h" // Change this to fit your project
@ -122,8 +120,7 @@ float GuiCurveEval(GuiCurveEditorState *state, float t);
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Module Functions Definition // Module Functions Definition
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
GuiCurveEditorState InitGuiCurveEditor()
GuiCurveEditorState GuiInitCurveEditor()
{ {
GuiCurveEditorState state = { 0 }; GuiCurveEditorState state = { 0 };
@ -155,7 +152,7 @@ static int CompareGuiCurveEditPointPtr(const void *a, const void *b)
float GuiCurveEval(GuiCurveEditorState *state, float t) float GuiCurveEval(GuiCurveEditorState *state, float t)
{ {
// Sort points // Sort points
GuiCurveEditorPoint* sortedPoints[GUI_CURVE_EDIT_MAX_POINTS]; GuiCurveEditorPoint* sortedPoints[GUI_CURVE_EDITOR_MAX_POINTS];
for (int i=0; i < state->numPoints; i++) sortedPoints[i] = &state->points[i]; for (int i=0; i < state->numPoints; i++) sortedPoints[i] = &state->points[i];
@ -313,7 +310,7 @@ void GuiCurveEditor(GuiCurveEditorState *state, Rectangle bounds)
for (int i = hoveredPointIndex; i < state->numPoints; i++) state->points[i] = state->points[i+1]; for (int i = hoveredPointIndex; i < state->numPoints; i++) state->points[i] = state->points[i+1];
} }
// Add a point (check against innerBounds) // Add a point (check against innerBounds)
else if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) && CheckCollisionPointRec(mouse, innerBounds) && (state->numPoints < GUI_CURVE_EDIT_MAX_POINTS)) else if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) && CheckCollisionPointRec(mouse, innerBounds) && (state->numPoints < GUI_CURVE_EDITOR_MAX_POINTS))
{ {
state->editLeftTangent = false; state->editLeftTangent = false;
state->editRightTangent = false; state->editRightTangent = false;
@ -347,7 +344,7 @@ void GuiCurveEditor(GuiCurveEditorState *state, Rectangle bounds)
} }
// Sort points // Sort points
GuiCurveEditorPoint *sortedPoints[GUI_CURVE_EDIT_MAX_POINTS] = { 0 }; GuiCurveEditorPoint *sortedPoints[GUI_CURVE_EDITOR_MAX_POINTS] = { 0 };
for (int i = 0; i < state->numPoints; i++) sortedPoints[i] = &state->points[i]; for (int i = 0; i < state->numPoints; i++) sortedPoints[i] = &state->points[i];
qsort(sortedPoints, state->numPoints, sizeof(GuiCurveEditorPoint*), CompareGuiCurveEditPointPtr); qsort(sortedPoints, state->numPoints, sizeof(GuiCurveEditorPoint*), CompareGuiCurveEditPointPtr);
@ -553,5 +550,5 @@ void GuiCurveEditor(GuiCurveEditorState *state, Rectangle bounds)
} }
} }
#endif // GUI_CURVE_EDIT_IMPLEMENTATION #endif // GUI_CURVE_EDITOR_IMPLEMENTATION

3
projects/VS2022/examples/animation_curve.vcxproj
View File

@ -351,6 +351,9 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\examples\animation_curve\animation_curve.c" /> <ClCompile Include="..\..\..\examples\animation_curve\animation_curve.c" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\examples\animation_curve\gui_curve_editor.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>