Merge branch 'master' of github.com:royqh1979/RedPanda-CPP

This commit is contained in:
Roy Qu 2022-07-03 09:33:09 +08:00
commit a3d6f89b82
9 changed files with 17 additions and 17 deletions

View File

@ -16,5 +16,5 @@ C=epitrochoid_c.txt
UnitCount=1
Type=1
IsCpp=0
linker=-lrdrawing -lraylib -lopengl32 -lgdi32 -lwinmm
linker=-lrdrawing -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
ExecEncoding=UTF-8

View File

@ -3,7 +3,7 @@
#include <math.h>
#define RAYGUI_IMPLEMENTATION
#include <raygui/raygui.h>
#include <raygui.h>
void updateRadius(int baseL, int outerL, int pointL, int *pBaseR, int *pOuterR, int *pPointR) {
int totalL=baseL+outerL;
@ -61,8 +61,8 @@ int main() {
trackColor= GuiColorPicker((Rectangle){ 50, 250, 196, 192 }, NULL, trackColor);
int doClear = GuiButton((Rectangle){ 120, 700, 80, 30 },"Clear");
if (newOuterL!=outerL || newBaseL!=baseL || newPointL!=pointL) {
if (newInnerL!=innerL)
pointL=newInnerL;
if (newOuterL!=outerL)
pointL=newOuterL;
else
pointL=newPointL;
outerL=newOuterL;

View File

@ -16,5 +16,5 @@ C=hypotrochoid_c.txt
UnitCount=1
Type=1
IsCpp=0
linker=-lrdrawing -lraylib -lopengl32 -lgdi32 -lwinmm
linker=-lrdrawing -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
ExecEncoding=UTF-8

View File

@ -3,7 +3,7 @@
#include <math.h>
#define RAYGUI_IMPLEMENTATION
#include <raygui/raygui.h>
#include <raygui.h>
void updateRadius(int baseL, int innerL,int pointL, int *pBaseR, int *pInnerR, int *pPointR) {
int totalL=baseL;

View File

@ -16,6 +16,6 @@ C=raygui_c.txt
UnitCount=1
Type=1
IsCpp=0
linker=-lraylib -lopengl32 -lgdi32 -lwinmm
linker=-lraylib -lGL -lm -lpthread -ldl -lrt -lX11
ExecEncoding=UTF-8

View File

@ -34,12 +34,12 @@
*
**********************************************************************************************/
#include "raylib.h"
#include <raylib.h>
#define RAYGUI_IMPLEMENTATION
//#define RAYGUI_CUSTOM_ICONS // It requires providing gui_icons.h in the same directory
//#include "gui_icons.h" // External icons data provided, it can be generated with rGuiIcons tool
#include "raygui/raygui.h"
#include <raygui.h>
#include <string.h> // Required for: strcpy()

View File

@ -3,7 +3,7 @@
#include <math.h>
#define RAYGUI_IMPLEMENTATION
#include <raygui/raygui.h>
#include <raygui.h>
void updateRadius(int baseL, int outerL, int pointL, int *pBaseR, int *pOuterR, int *pPointR) {
int totalL=baseL+outerL;

View File

@ -3,7 +3,7 @@
#include <math.h>
#define RAYGUI_IMPLEMENTATION
#include <raygui/raygui.h>
#include <raygui.h>
void updateRadius(int baseL, int innerL,int pointL, int *pBaseR, int *pInnerR, int *pPointR) {
int totalL=baseL;

View File

@ -34,12 +34,12 @@
*
**********************************************************************************************/
#include "raylib.h"
#include <raylib.h>
#define RAYGUI_IMPLEMENTATION
//#define RAYGUI_CUSTOM_ICONS // It requires providing gui_icons.h in the same directory
//#include "gui_icons.h" // External icons data provided, it can be generated with rGuiIcons tool
#include "raygui/raygui.h"
#include <raygui.h>
#include <string.h> // Required for: strcpy()