mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-29 23:22:55 +00:00
22a0949a26
Upgrade to build and run from VS2019 Upgrades to Xcode project and Apple Silicon support Update SDL2 to 2.0.14 Updated SDL2 include files to fix Mac build in GitHub Actions Added another mention of arm64 to command line help Restored original opus sse files, excluded from Xcode Added arm64 to the post-build symlinking step Merge branch 'main' into xcode Merge branch 'main' into vs2019 Added shell script to compile Universal 2 binary (x86_64+arm64) Reverting alert style to deprecated methods Upgrades to Xcode project and Apple Silicon support Update SDL2 to 2.0.14 Added another mention of arm64 to command line help Restored original opus sse files, excluded from Xcode Added arm64 to the post-build symlinking step Added shell script to compile Universal 2 binary (x86_64+arm64) Reverting alert style to deprecated methods Merge branch 'xcode' of https://github.com/tomkidd/ioq3 into xcode Removed signature from SDL dylib, enabled dark mode on macOS. spaces > tabs Ad-hoc signed libSDL2-2.0.0.dylib Fix compiling against SDL 2.0.17 UB2 now signs and notarizes, upgraded to SDL 2.0.16 Architectures in libSDL2 restored for ppc and i386 Merge remote-tracking branch 'upstream/main' into vs2019 Update SDL2 to 2.0.16 Added rudimentary support for automatically finding Microsoft Store version of Quake 3 GHA deprecated Ubuntu 16.04 - update to 18.04 qsort cannot be called with NULL Merge remote-tracking branch 'upstream/main' into vs2019 Addressed string concatenation issue and added dummy method for Mac/Linux Added missing variable. Merge remote-tracking branch 'upstream/main' into xcode Updated SDL 2.0.16 headers and Mac version of libraries to fix GitHub actions Addressed PR suggestions Modified MS Store path handling to better follow the pattern of Steam/GOG Merge pull request #481 from tomkidd/xcode Merge pull request #482 from tomkidd/vs2019 OpenGL2: Fix r_grayscale 1 making everything solid black Print full GL_EXTENSIONS list for OpenGL contexts before 3.0 Fix being unable to enter Team Arena CD key OpenGL2: GL_DEPTH_TEXTURE_MODE was removed from OpenGL 3.0/Core Improve setting Microsoft Store path Update building for macOS in README Make macOS arm64 default to target macOS 11 in Makefile Fix error when cross-compiling for macOS arm64 using Makefile Fix passing arguments to VM dylib on Apple M1 Fix compiling on older macOS Fix memory corruption in S_TransferPaintBuffer Fix memset Fix hex digit Fix uninitialized variable some old URL and doc updates Update README.md Update FUNDING.yml code/curl: update ifdef condition for MCST-LCC compiler in mcst-lcc compiler => 1.25 added a new macro definition to determine compiler Revert "code/curl: update ifdef condition for MCST-LCC compiler" Revert "E2K: fixed build by MCST lcc compiler when using USE_CURL=1 option" More predictable mesh normals generation vm_x86.c: Add `defined(_M_IX86) || defined(_M_X64)` (fix for VS2019) Add keys for SDL 2.0.14's new gamepad buttons Fix in_availableJoysticks cvar not updating Fix (disabled) Wavelet sound decompression Update to SDL 2.24.0 and add separate macOS UB2 dylib Update macOS UB1 to SDL 2.0.22 Fix running make-macosx{,-ub2}.sh on Linux Update MSVC .lib files to SDL 2.24.0
168 lines
5.3 KiB
C
168 lines
5.3 KiB
C
/*
|
|
Simple DirectMedia Layer
|
|
Copyright (C) 1997-2022 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
|
|
arising from the use of this software.
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
including commercial applications, and to alter it and redistribute it
|
|
freely, subject to the following restrictions:
|
|
|
|
1. The origin of this software must not be misrepresented; you must not
|
|
claim that you wrote the original software. If you use this software
|
|
in a product, an acknowledgment in the product documentation would be
|
|
appreciated but is not required.
|
|
2. Altered source versions must be plainly marked as such, and must not be
|
|
misrepresented as being the original software.
|
|
3. This notice may not be removed or altered from any source distribution.
|
|
*/
|
|
|
|
/**
|
|
* \file SDL_test_font.h
|
|
*
|
|
* Include file for SDL test framework.
|
|
*
|
|
* This code is a part of the SDL2_test library, not the main SDL library.
|
|
*/
|
|
|
|
#ifndef SDL_test_font_h_
|
|
#define SDL_test_font_h_
|
|
|
|
#include "begin_code.h"
|
|
/* Set up for C function definitions, even when using C++ */
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Function prototypes */
|
|
|
|
#define FONT_CHARACTER_SIZE 8
|
|
#define FONT_LINE_HEIGHT (FONT_CHARACTER_SIZE + 2)
|
|
|
|
/**
|
|
* \brief Draw a string in the currently set font.
|
|
*
|
|
* \param renderer The renderer to draw on.
|
|
* \param x The X coordinate of the upper left corner of the character.
|
|
* \param y The Y coordinate of the upper left corner of the character.
|
|
* \param c The character to draw.
|
|
*
|
|
* \returns 0 on success, -1 on failure.
|
|
*/
|
|
int SDLTest_DrawCharacter(SDL_Renderer *renderer, int x, int y, Uint32 c);
|
|
|
|
/**
|
|
* \brief Draw a UTF-8 string in the currently set font.
|
|
*
|
|
* The font currently only supports characters in the Basic Latin and Latin-1 Supplement sets.
|
|
*
|
|
* \param renderer The renderer to draw on.
|
|
* \param x The X coordinate of the upper left corner of the string.
|
|
* \param y The Y coordinate of the upper left corner of the string.
|
|
* \param s The string to draw.
|
|
*
|
|
* \returns 0 on success, -1 on failure.
|
|
*/
|
|
int SDLTest_DrawString(SDL_Renderer *renderer, int x, int y, const char *s);
|
|
|
|
/**
|
|
* \brief Data used for multi-line text output
|
|
*/
|
|
typedef struct SDLTest_TextWindow
|
|
{
|
|
SDL_Rect rect;
|
|
int current;
|
|
int numlines;
|
|
char **lines;
|
|
} SDLTest_TextWindow;
|
|
|
|
/**
|
|
* \brief Create a multi-line text output window
|
|
*
|
|
* \param x The X coordinate of the upper left corner of the window.
|
|
* \param y The Y coordinate of the upper left corner of the window.
|
|
* \param w The width of the window (currently ignored)
|
|
* \param h The height of the window (currently ignored)
|
|
*
|
|
* \returns the new window, or NULL on failure.
|
|
*
|
|
* \since This function is available since SDL 2.24.0
|
|
*/
|
|
SDLTest_TextWindow *SDLTest_TextWindowCreate(int x, int y, int w, int h);
|
|
|
|
/**
|
|
* \brief Display a multi-line text output window
|
|
*
|
|
* This function should be called every frame to display the text
|
|
*
|
|
* \param textwin The text output window
|
|
* \param renderer The renderer to use for display
|
|
*
|
|
* \since This function is available since SDL 2.24.0
|
|
*/
|
|
void SDLTest_TextWindowDisplay(SDLTest_TextWindow *textwin, SDL_Renderer *renderer);
|
|
|
|
/**
|
|
* \brief Add text to a multi-line text output window
|
|
*
|
|
* Adds UTF-8 text to the end of the current text. The newline character starts a
|
|
* new line of text. The backspace character deletes the last character or, if the
|
|
* line is empty, deletes the line and goes to the end of the previous line.
|
|
*
|
|
* \param textwin The text output window
|
|
* \param fmt A printf() style format string
|
|
* \param ... additional parameters matching % tokens in the `fmt` string, if any
|
|
*
|
|
* \since This function is available since SDL 2.24.0
|
|
*/
|
|
void SDLTest_TextWindowAddText(SDLTest_TextWindow *textwin, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2);
|
|
|
|
/**
|
|
* \brief Add text to a multi-line text output window
|
|
*
|
|
* Adds UTF-8 text to the end of the current text. The newline character starts a
|
|
* new line of text. The backspace character deletes the last character or, if the
|
|
* line is empty, deletes the line and goes to the end of the previous line.
|
|
*
|
|
* \param textwin The text output window
|
|
* \param text The text to add to the window
|
|
* \param len The length, in bytes, of the text to add to the window
|
|
*
|
|
* \since This function is available since SDL 2.24.0
|
|
*/
|
|
void SDLTest_TextWindowAddTextWithLength(SDLTest_TextWindow *textwin, const char *text, size_t len);
|
|
|
|
/**
|
|
* \brief Clear the text in a multi-line text output window
|
|
*
|
|
* \param textwin The text output window
|
|
*
|
|
* \since This function is available since SDL 2.24.0
|
|
*/
|
|
void SDLTest_TextWindowClear(SDLTest_TextWindow *textwin);
|
|
|
|
/**
|
|
* \brief Free the storage associated with a multi-line text output window
|
|
*
|
|
* \param textwin The text output window
|
|
*
|
|
* \since This function is available since SDL 2.24.0
|
|
*/
|
|
void SDLTest_TextWindowDestroy(SDLTest_TextWindow *textwin);
|
|
|
|
/**
|
|
* \brief Cleanup textures used by font drawing functions.
|
|
*/
|
|
void SDLTest_CleanupTextDrawing(void);
|
|
|
|
/* Ends C function definitions when using C++ */
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#include "close_code.h"
|
|
|
|
#endif /* SDL_test_font_h_ */
|
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|