mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 23:24:41 +00:00
Updates the SDL library to the latest standard bugfix release
This commit is contained in:
JeffR
parent
cb766f2878
commit
083d2175ea
1280 changed files with 343926 additions and 179615 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
|
||||
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
|
|
@ -22,22 +22,26 @@
|
|||
#define SCREEN_WIDTH 320
|
||||
#define SCREEN_HEIGHT 480
|
||||
#else
|
||||
#define SCREEN_WIDTH 640
|
||||
#define SCREEN_HEIGHT 480
|
||||
#define SCREEN_WIDTH 640
|
||||
#define SCREEN_HEIGHT 480
|
||||
#endif
|
||||
|
||||
static SDL_Window *window;
|
||||
|
||||
typedef struct _Line {
|
||||
struct _Line *next;
|
||||
typedef struct _Object
|
||||
{
|
||||
struct _Object *next;
|
||||
|
||||
int x1, y1, x2, y2;
|
||||
Uint8 r, g, b;
|
||||
} Line;
|
||||
|
||||
static Line *active = NULL;
|
||||
static Line *lines = NULL;
|
||||
SDL_bool isRect;
|
||||
} Object;
|
||||
|
||||
static Object *active = NULL;
|
||||
static Object *objects = NULL;
|
||||
static int buttons = 0;
|
||||
static SDL_bool isRect = SDL_FALSE;
|
||||
|
||||
static SDL_bool wheel_x_active = SDL_FALSE;
|
||||
static SDL_bool wheel_y_active = SDL_FALSE;
|
||||
|
|
@ -46,39 +50,59 @@ static float wheel_y = SCREEN_HEIGHT * 0.5f;
|
|||
|
||||
static SDL_bool done = SDL_FALSE;
|
||||
|
||||
void
|
||||
DrawLine(SDL_Renderer * renderer, Line * line)
|
||||
void DrawObject(SDL_Renderer *renderer, Object *object)
|
||||
{
|
||||
SDL_SetRenderDrawColor(renderer, line->r, line->g, line->b, 255);
|
||||
SDL_RenderDrawLine(renderer, line->x1, line->y1, line->x2, line->y2);
|
||||
SDL_SetRenderDrawColor(renderer, object->r, object->g, object->b, 255);
|
||||
|
||||
if (object->isRect) {
|
||||
SDL_Rect rect;
|
||||
|
||||
if (object->x1 > object->x2) {
|
||||
rect.x = object->x2;
|
||||
rect.w = object->x1 - object->x2;
|
||||
} else {
|
||||
rect.x = object->x1;
|
||||
rect.w = object->x2 - object->x1;
|
||||
}
|
||||
|
||||
if (object->y1 > object->y2) {
|
||||
rect.y = object->y2;
|
||||
rect.h = object->y1 - object->y2;
|
||||
} else {
|
||||
rect.y = object->y1;
|
||||
rect.h = object->y2 - object->y1;
|
||||
}
|
||||
|
||||
/* SDL_RenderDrawRect(renderer, &rect); */
|
||||
SDL_RenderFillRect(renderer, &rect);
|
||||
} else {
|
||||
SDL_RenderDrawLine(renderer, object->x1, object->y1, object->x2, object->y2);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
DrawLines(SDL_Renderer * renderer)
|
||||
void DrawObjects(SDL_Renderer *renderer)
|
||||
{
|
||||
Line *next = lines;
|
||||
Object *next = objects;
|
||||
while (next != NULL) {
|
||||
DrawLine(renderer, next);
|
||||
DrawObject(renderer, next);
|
||||
next = next->next;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
AppendLine(Line *line)
|
||||
void AppendObject(Object *object)
|
||||
{
|
||||
if (lines) {
|
||||
Line *next = lines;
|
||||
if (objects) {
|
||||
Object *next = objects;
|
||||
while (next->next != NULL) {
|
||||
next = next->next;
|
||||
}
|
||||
next->next = line;
|
||||
next->next = object;
|
||||
} else {
|
||||
lines = line;
|
||||
objects = object;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
loop(void *arg)
|
||||
void loop(void *arg)
|
||||
{
|
||||
SDL_Renderer *renderer = (SDL_Renderer *)arg;
|
||||
SDL_Event event;
|
||||
|
|
@ -87,65 +111,108 @@ loop(void *arg)
|
|||
while (SDL_PollEvent(&event)) {
|
||||
switch (event.type) {
|
||||
case SDL_MOUSEWHEEL:
|
||||
if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
|
||||
event.wheel.preciseX *= -1.0f;
|
||||
event.wheel.preciseY *= -1.0f;
|
||||
event.wheel.x *= -1;
|
||||
event.wheel.y *= -1;
|
||||
}
|
||||
if (event.wheel.preciseX != 0.0f) {
|
||||
wheel_x_active = SDL_TRUE;
|
||||
/* "positive to the right and negative to the left" */
|
||||
wheel_x += event.wheel.preciseX * 10.0f;
|
||||
}
|
||||
if (event.wheel.preciseY != 0.0f) {
|
||||
wheel_y_active = SDL_TRUE;
|
||||
/* "positive away from the user and negative towards the user" */
|
||||
wheel_y -= event.wheel.preciseY * 10.0f;
|
||||
}
|
||||
break;
|
||||
if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
|
||||
event.wheel.preciseX *= -1.0f;
|
||||
event.wheel.preciseY *= -1.0f;
|
||||
event.wheel.x *= -1;
|
||||
event.wheel.y *= -1;
|
||||
}
|
||||
if (event.wheel.preciseX != 0.0f) {
|
||||
wheel_x_active = SDL_TRUE;
|
||||
/* "positive to the right and negative to the left" */
|
||||
wheel_x += event.wheel.preciseX * 10.0f;
|
||||
}
|
||||
if (event.wheel.preciseY != 0.0f) {
|
||||
wheel_y_active = SDL_TRUE;
|
||||
/* "positive away from the user and negative towards the user" */
|
||||
wheel_y -= event.wheel.preciseY * 10.0f;
|
||||
}
|
||||
break;
|
||||
|
||||
case SDL_MOUSEMOTION:
|
||||
if (!active)
|
||||
if (active == NULL) {
|
||||
break;
|
||||
}
|
||||
|
||||
active->x2 = event.motion.x;
|
||||
active->y2 = event.motion.y;
|
||||
break;
|
||||
|
||||
case SDL_MOUSEBUTTONDOWN:
|
||||
if (!active) {
|
||||
if (active == NULL) {
|
||||
active = SDL_calloc(1, sizeof(*active));
|
||||
active->x1 = active->x2 = event.button.x;
|
||||
active->y1 = active->y2 = event.button.y;
|
||||
active->isRect = isRect;
|
||||
}
|
||||
|
||||
switch (event.button.button) {
|
||||
case SDL_BUTTON_LEFT: active->r = 255; buttons |= SDL_BUTTON_LMASK; break;
|
||||
case SDL_BUTTON_MIDDLE: active->g = 255; buttons |= SDL_BUTTON_MMASK; break;
|
||||
case SDL_BUTTON_RIGHT: active->b = 255; buttons |= SDL_BUTTON_RMASK; break;
|
||||
case SDL_BUTTON_X1: active->r = 255; active->b = 255; buttons |= SDL_BUTTON_X1MASK; break;
|
||||
case SDL_BUTTON_X2: active->g = 255; active->b = 255; buttons |= SDL_BUTTON_X2MASK; break;
|
||||
case SDL_BUTTON_LEFT:
|
||||
active->r = 255;
|
||||
buttons |= SDL_BUTTON_LMASK;
|
||||
break;
|
||||
case SDL_BUTTON_MIDDLE:
|
||||
active->g = 255;
|
||||
buttons |= SDL_BUTTON_MMASK;
|
||||
break;
|
||||
case SDL_BUTTON_RIGHT:
|
||||
active->b = 255;
|
||||
buttons |= SDL_BUTTON_RMASK;
|
||||
break;
|
||||
case SDL_BUTTON_X1:
|
||||
active->r = 255;
|
||||
active->b = 255;
|
||||
buttons |= SDL_BUTTON_X1MASK;
|
||||
break;
|
||||
case SDL_BUTTON_X2:
|
||||
active->g = 255;
|
||||
active->b = 255;
|
||||
buttons |= SDL_BUTTON_X2MASK;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case SDL_MOUSEBUTTONUP:
|
||||
if (!active)
|
||||
if (active == NULL) {
|
||||
break;
|
||||
}
|
||||
|
||||
switch (event.button.button) {
|
||||
case SDL_BUTTON_LEFT: buttons &= ~SDL_BUTTON_LMASK; break;
|
||||
case SDL_BUTTON_MIDDLE: buttons &= ~SDL_BUTTON_MMASK; break;
|
||||
case SDL_BUTTON_RIGHT: buttons &= ~SDL_BUTTON_RMASK; break;
|
||||
case SDL_BUTTON_X1: buttons &= ~SDL_BUTTON_X1MASK; break;
|
||||
case SDL_BUTTON_X2: buttons &= ~SDL_BUTTON_X2MASK; break;
|
||||
case SDL_BUTTON_LEFT:
|
||||
buttons &= ~SDL_BUTTON_LMASK;
|
||||
break;
|
||||
case SDL_BUTTON_MIDDLE:
|
||||
buttons &= ~SDL_BUTTON_MMASK;
|
||||
break;
|
||||
case SDL_BUTTON_RIGHT:
|
||||
buttons &= ~SDL_BUTTON_RMASK;
|
||||
break;
|
||||
case SDL_BUTTON_X1:
|
||||
buttons &= ~SDL_BUTTON_X1MASK;
|
||||
break;
|
||||
case SDL_BUTTON_X2:
|
||||
buttons &= ~SDL_BUTTON_X2MASK;
|
||||
break;
|
||||
}
|
||||
|
||||
if (buttons == 0) {
|
||||
AppendLine(active);
|
||||
AppendObject(active);
|
||||
active = NULL;
|
||||
}
|
||||
break;
|
||||
|
||||
case SDL_KEYDOWN:
|
||||
case SDL_KEYUP:
|
||||
switch (event.key.keysym.sym) {
|
||||
case SDLK_LSHIFT:
|
||||
isRect = (event.key.state == SDL_PRESSED);
|
||||
if (active) {
|
||||
active->isRect = isRect;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case SDL_QUIT:
|
||||
done = SDL_TRUE;
|
||||
break;
|
||||
|
|
@ -161,16 +228,17 @@ loop(void *arg)
|
|||
/* Mouse wheel */
|
||||
SDL_SetRenderDrawColor(renderer, 0, 255, 128, 255);
|
||||
if (wheel_x_active) {
|
||||
SDL_RenderDrawLine(renderer, wheel_x, 0, wheel_x, SCREEN_HEIGHT);
|
||||
SDL_RenderDrawLine(renderer, (int)wheel_x, 0, (int)wheel_x, SCREEN_HEIGHT);
|
||||
}
|
||||
if (wheel_y_active) {
|
||||
SDL_RenderDrawLine(renderer, 0, wheel_y, SCREEN_WIDTH, wheel_y);
|
||||
SDL_RenderDrawLine(renderer, 0, (int)wheel_y, SCREEN_WIDTH, (int)wheel_y);
|
||||
}
|
||||
|
||||
/* Lines from mouse clicks */
|
||||
DrawLines(renderer);
|
||||
if (active)
|
||||
DrawLine(renderer, active);
|
||||
/* Objects from mouse clicks */
|
||||
DrawObjects(renderer);
|
||||
if (active) {
|
||||
DrawObject(renderer, active);
|
||||
}
|
||||
|
||||
SDL_RenderPresent(renderer);
|
||||
|
||||
|
|
@ -181,8 +249,7 @@ loop(void *arg)
|
|||
#endif
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
SDL_Renderer *renderer;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue