mirror of
https://github.com/nicbarker/clay.git
synced 2025-04-18 20:28:01 +00:00
Merge 23863edde0
into a093730da2
This commit is contained in:
commit
5ca859b9d6
@ -1,6 +1,7 @@
|
|||||||
#define CLAY_IMPLEMENTATION
|
#define CLAY_IMPLEMENTATION
|
||||||
#include "../../clay.h"
|
#include "../../clay.h"
|
||||||
#include "../../renderers/raylib/clay_renderer_raylib.c"
|
#define CLAY_RAYLIB_IMPLEMENTATION // This is different to the video, the raylib renderer is now in a header file
|
||||||
|
#include "../../renderers/raylib/clay_renderer_raylib.h"
|
||||||
|
|
||||||
const int FONT_ID_BODY_16 = 0;
|
const int FONT_ID_BODY_16 = 0;
|
||||||
Clay_Color COLOR_WHITE = { 255, 255, 255, 255};
|
Clay_Color COLOR_WHITE = { 255, 255, 255, 255};
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#define CLAY_IMPLEMENTATION
|
#define CLAY_IMPLEMENTATION
|
||||||
#include "../../clay.h"
|
#include "../../clay.h"
|
||||||
#include "../../renderers/raylib/clay_renderer_raylib.c"
|
#define CLAY_RAYLIB_IMPLEMENTATION
|
||||||
|
#include "../../renderers/raylib/clay_renderer_raylib.h"
|
||||||
|
|
||||||
const uint32_t FONT_ID_BODY_24 = 0;
|
const uint32_t FONT_ID_BODY_24 = 0;
|
||||||
const uint32_t FONT_ID_BODY_16 = 1;
|
const uint32_t FONT_ID_BODY_16 = 1;
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
#ifndef CLAY_RENDERER_RAYLIB_H
|
||||||
|
#define CLAY_RENDERER_RAYLIB_H
|
||||||
|
|
||||||
#include "raylib.h"
|
#include "raylib.h"
|
||||||
#include "raymath.h"
|
#include "raymath.h"
|
||||||
#include "stdint.h"
|
#include "stdint.h"
|
||||||
@ -14,8 +17,6 @@ typedef struct
|
|||||||
Font font;
|
Font font;
|
||||||
} Raylib_Font;
|
} Raylib_Font;
|
||||||
|
|
||||||
Raylib_Font Raylib_fonts[10];
|
|
||||||
Camera Raylib_camera;
|
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
@ -38,6 +39,14 @@ typedef struct
|
|||||||
};
|
};
|
||||||
} CustomLayoutElement;
|
} CustomLayoutElement;
|
||||||
|
|
||||||
|
#ifdef CLAY_RAYLIB_IMPLEMENTATION
|
||||||
|
#undef CLAY_RAYLIB_IMPLEMENTATION
|
||||||
|
|
||||||
|
// Global state
|
||||||
|
Raylib_Font Raylib_fonts[10];
|
||||||
|
Camera Raylib_camera;
|
||||||
|
uint32_t measureCalls = 0;
|
||||||
|
|
||||||
// Get a ray trace from the screen position (i.e mouse) within a specific section of the screen
|
// Get a ray trace from the screen position (i.e mouse) within a specific section of the screen
|
||||||
Ray GetScreenToWorldPointWithZDistance(Vector2 position, Camera camera, int screenWidth, int screenHeight, float zDistance)
|
Ray GetScreenToWorldPointWithZDistance(Vector2 position, Camera camera, int screenWidth, int screenHeight, float zDistance)
|
||||||
{
|
{
|
||||||
@ -87,8 +96,6 @@ Ray GetScreenToWorldPointWithZDistance(Vector2 position, Camera camera, int scre
|
|||||||
return ray;
|
return ray;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t measureCalls = 0;
|
|
||||||
|
|
||||||
static inline Clay_Dimensions Raylib_MeasureText(Clay_String *text, Clay_TextElementConfig *config) {
|
static inline Clay_Dimensions Raylib_MeasureText(Clay_String *text, Clay_TextElementConfig *config) {
|
||||||
measureCalls++;
|
measureCalls++;
|
||||||
// Measure string size for Font
|
// Measure string size for Font
|
||||||
@ -122,6 +129,7 @@ static inline Clay_Dimensions Raylib_MeasureText(Clay_String *text, Clay_TextEle
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Clay_Raylib_Initialize(int width, int height, const char *title, unsigned int flags) {
|
void Clay_Raylib_Initialize(int width, int height, const char *title, unsigned int flags) {
|
||||||
|
measureCalls = 0;
|
||||||
SetConfigFlags(flags);
|
SetConfigFlags(flags);
|
||||||
InitWindow(width, height, title);
|
InitWindow(width, height, title);
|
||||||
// EnableEventWaiting();
|
// EnableEventWaiting();
|
||||||
@ -231,3 +239,6 @@ void Clay_Raylib_Render(Clay_RenderCommandArray renderCommands)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // CLAY_RAYLIB_IMPLEMENTATION
|
||||||
|
#endif // CLAY_RENDERER_RAYLIB_H
|
Loading…
Reference in New Issue
Block a user