twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2026-01-29 02:09:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Review layouts and examples

Browse Source
This commit is contained in:
Ray San
2018-04-09 09:05:13 +02:00
parent 27fd72121e
commit a0400b6ff7
7 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/raw_importer/raw_importer.c
View File

@ -18,7 +18,6 @@
#include <string.h> // Required for: strcpy() #include <string.h> // Required for: strcpy()
#include <stdlib.h> // Required for: atoi() #include <stdlib.h> // Required for: atoi()
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
// Program main entry point // Program main entry point
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
@ -56,8 +55,6 @@ int main(int argc, char *argv[0])
int format = UNCOMPRESSED_R8G8B8A8; int format = UNCOMPRESSED_R8G8B8A8;
int headerSize = 0; int headerSize = 0;
GuiLoadStyleImage("rguistyle_default_dark.png");
InitWindow(SCREEN_WIDTH, SCREEN_HEIGHT, "raw image importer"); InitWindow(SCREEN_WIDTH, SCREEN_HEIGHT, "raw image importer");
Texture2D texture = { 0 }; Texture2D texture = { 0 };
@ -146,7 +143,6 @@ int main(int argc, char *argv[0])
} }
if (imageLoaded) imageScale += (float)GetMouseWheelMove(); // Image scale control if (imageLoaded) imageScale += (float)GetMouseWheelMove(); // Image scale control
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Draw // Draw

BIN
examples/raw_importer/raw_importer_REV4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
examples/raw_importer/rguistyle_default_dark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

16
tools/rGuiLayout/layouts/image_exporter.rgl
View File

@ -13,11 +13,11 @@ a 004 0 0 0
a 005 0 0 0 a 005 0 0 0
a 006 0 0 0 a 006 0 0 0
a 007 0 0 0 a 007 0 0 0
c 000 13 0 0 220 161 1 Image Export Options c 000 13 0 0 250 205 1 Image Export Options
c 001 9 77 32 130 20 1 Laser/Shoot c 001 9 80 35 160 30 1 Laser/Shoot
c 002 9 77 62 130 20 1 SAMPLE TEXT c 002 9 80 75 160 30 1 SAMPLE TEXT
c 003 11 77 92 131 22 1 Untitled c 003 11 80 115 160 30 1 Untitled
c 004 1 10 124 200 30 1 Export Image c 004 1 10 160 230 30 1 Export Image
c 005 0 10 38 60 20 1 File format c 005 0 10 43 60 20 1 File format:
c 006 0 10 68 61 20 1 Pixel format c 006 0 10 85 63 20 1 Pixel format:
c 007 0 10 98 50 20 1 File name c 007 0 10 125 50 20 1 File name:

45
tools/rGuiLayout/layouts/raw_importer.rgl
View File

@ -1,7 +1,7 @@
# #
# rgl text file (v1.0) - raygui layout text file generated using rGuiLayout # rgl text file (v1.0) - raygui layout text file generated using rGuiLayout
# #
# Total number of controls: 22 # Total number of controls: 21
# Anchor info: a <id> <posx> <posy> <enabled> # Anchor info: a <id> <posx> <posy> <enabled>
# Control info: c <id> <type> <rectangle> <anchor_id> <text> # Control info: c <id> <type> <rectangle> <anchor_id> <text>
# #
@ -13,25 +13,24 @@ a 004 0 0 0
a 005 0 0 0 a 005 0 0 0
a 006 0 0 0 a 006 0 0 0
a 007 0 0 0 a 007 0 0 0
c 000 13 0 0 200 452 1 RAW Import Options c 000 13 0 0 200 475 1 RAW Import Options
c 002 0 9 50 80 20 1 File size: c 002 0 10 55 80 20 1 File size:
c 004 0 19 100 30 20 1 Width: c 004 0 20 108 33 20 1 Width:
c 005 0 19 125 33 20 1 Height: c 005 0 20 138 33 20 1 Height:
c 006 0 149 100 30 20 1 pixels c 006 0 145 107 30 20 1 pixels
c 007 0 149 125 30 20 1 pixels c 007 0 145 136 30 20 1 pixels
c 008 11 59 95 80 20 1 SAMPLE TEXT c 008 11 60 100 80 25 1 256
c 009 11 59 120 80 20 1 SAMPLE TEXT c 009 11 60 130 81 25 1 256
c 011 0 21 188 63 20 1 Pixel format: c 012 9 20 195 160 30 1 SAMPLE TEXT
c 012 9 20 202 158 21 1 SAMPLE TEXT c 013 0 20 250 50 20 1 Channels:
c 013 0 20 238 50 20 1 Channels: c 012 4 20 265 159 25 1 Bit Depth:
c 012 4 20 251 156 20 1 Bit Depth: c 013 4 20 315 159 25 1 Bit Depth:
c 013 4 20 292 156 20 1 Bit Depth: c 014 0 20 300 50 20 1 Bit Depth:
c 014 0 20 279 50 20 1 Bit Depth: c 015 0 25 388 22 20 1 Size:
c 015 0 19 366 22 20 1 Size: c 016 0 147 387 30 20 1 bytes
c 016 0 149 366 30 20 1 bytes c 017 11 55 380 85 25 1 4096
c 017 11 59 361 80 20 1 SAMPLE TEXT c 018 1 10 430 180 30 1 Import
c 018 1 9 411 180 24 1 Import c 019 12 10 365 180 50 1 Header
c 019 12 9 346 179 49 1 Header c 020 12 10 180 180 170 1 Pixel Format
c 020 12 9 175 179 150 1 Pixels Data c 021 12 10 85 180 80 1 Resolution
c 021 12 9 75 179 79 1 Resolution c 022 0 10 35 65 20 1 Import file:
c 022 0 9 30 54 20 1 Import file:

2
tools/rGuiLayout/layouts/rfxgen.rgl
View File

@ -2,7 +2,7 @@
# rgl text file (v1.0) - raygui layout text file generated using rGuiLayout # rgl text file (v1.0) - raygui layout text file generated using rGuiLayout
# #
# Total number of controls: 108 # Total number of controls: 108
# Anchor info: a <id> <posx> <posy> <enabled> # Anchor info: a <id> <posx> <posy> <enabled>
# Control info: c <id> <type> <rectangle> <anchor_id> <text> # Control info: c <id> <type> <rectangle> <anchor_id> <text>
# #
a 000 0 0 1 a 000 0 0 1

10
tools/rGuiLayout/rguilayout.c
View File

@ -26,7 +26,7 @@
#define MAX_GUI_CONTROLS 256 // Maximum number of gui controls #define MAX_GUI_CONTROLS 256 // Maximum number of gui controls
#define MAX_ANCHOR_POINTS 8 // Maximum number of anchor points #define MAX_ANCHOR_POINTS 8 // Maximum number of anchor points
#define GRID_LINE_SPACING 10 // Grid line spacing in pixels #define GRID_LINE_SPACING 5 // Grid line spacing in pixels
#define GRID_ALPHA 0.1f // Grid lines alpha amount #define GRID_ALPHA 0.1f // Grid lines alpha amount
#define ANCHOR_RADIUS 20 // Default anchor radius #define ANCHOR_RADIUS 20 // Default anchor radius
@ -1125,7 +1125,9 @@ int main()
if (snapMode) GuiStatusBar((Rectangle){ 249, GetScreenHeight() - 24, 81, 24}, "SNAP ON", 10); if (snapMode) GuiStatusBar((Rectangle){ 249, GetScreenHeight() - 24, 81, 24}, "SNAP ON", 10);
else GuiStatusBar((Rectangle){ 249, GetScreenHeight() - 24, 81, 24}, "SNAP OFF", 10); else GuiStatusBar((Rectangle){ 249, GetScreenHeight() - 24, 81, 24}, "SNAP OFF", 10);
GuiStatusBar((Rectangle){ 329, GetScreenHeight() - 24, 80, 24}, "Tab - Help", 10); GuiStatusBar((Rectangle){ 329, GetScreenHeight() - 24, 80, 24}, "Tab - Help", 10);
GuiStatusBar((Rectangle){ 400, GetScreenHeight() - 24, GetScreenWidth() - 400, 24}, FormatText("Selected Control: %s (%i, %i, %i, %i)", controlTypeName[selectedType], layout[selectedControl].rec.x, layout[selectedControl].rec.y, layout[selectedControl].rec.width, layout[selectedControl].rec.height), 15); if (selectedControl != -1) GuiStatusBar((Rectangle){ 400, GetScreenHeight() - 24, GetScreenWidth() - 400, 24}, FormatText("Selected Control: #%03i | %s | rec(%i, %i, %i, %i)", selectedControl, controlTypeName[selectedType], layout[selectedControl].rec.x, layout[selectedControl].rec.y, layout[selectedControl].rec.width, layout[selectedControl].rec.height), 15);
else GuiStatusBar((Rectangle){ 400, GetScreenHeight() - 24, GetScreenWidth() - 400, 24}, "", 15);
EndDrawing(); EndDrawing();
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
@ -1235,8 +1237,8 @@ static void SaveLayoutRGL(const char *fileName, bool binary)
// Write some description comments // Write some description comments
fprintf(rglFile, "#\n# rgl text file (v%s) - raygui layout text file generated using rGuiLayout\n#\n", RGL_FILE_VERSION_TEXT); fprintf(rglFile, "#\n# rgl text file (v%s) - raygui layout text file generated using rGuiLayout\n#\n", RGL_FILE_VERSION_TEXT);
fprintf(rglFile, "# Total number of controls: %i\n", controlsCounter); fprintf(rglFile, "# Total number of controls: %i\n", controlsCounter);
fprintf(rglFile, "# Anchor info: a <id> <posx> <posy> <enabled>\n"); fprintf(rglFile, "# Anchor info: a <id> <posx> <posy> <enabled>\n");
fprintf(rglFile, "# Control info: c <id> <type> <rectangle> <anchor_id> <text>\n#\n"); fprintf(rglFile, "# Control info: c <id> <type> <rectangle> <anchor_id> <text>\n#\n");
for (int i = 0; i < MAX_ANCHOR_POINTS; i++) for (int i = 0; i < MAX_ANCHOR_POINTS; i++)
{ {