REVIEWED: Formatting, follow raylib coding conventions
This commit is contained in:
parent
a805f46f55
commit
17cbc75aa7
27
examples/examples.rc
Normal file
27
examples/examples.rc
Normal file
@ -0,0 +1,27 @@
|
||||
GLFW_ICON ICON "raylib.ico"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION 1,0,0,0
|
||||
PRODUCTVERSION 1,0,0,0
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
//BLOCK "080904E4" // English UK
|
||||
BLOCK "040904E4" // English US
|
||||
BEGIN
|
||||
VALUE "CompanyName", "raylib technologies"
|
||||
VALUE "FileDescription", "raylib example"
|
||||
VALUE "FileVersion", "1.0"
|
||||
VALUE "InternalName", "raylib-example"
|
||||
VALUE "LegalCopyright", "(c) 2024 raylib technologies (@raylibtech)"
|
||||
//VALUE "OriginalFilename", "raylib_app.exe"
|
||||
VALUE "ProductName", "raylib-example"
|
||||
VALUE "ProductVersion", "1.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
//VALUE "Translation", 0x809, 1252 // English UK
|
||||
VALUE "Translation", 0x409, 1252 // English US
|
||||
END
|
||||
END
|
BIN
examples/raylib.ico
Normal file
BIN
examples/raylib.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 9.5 KiB |
@ -104,8 +104,6 @@ __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int CodePage,
|
||||
// Types and Structures Definition
|
||||
//----------------------------------------------------------------------------------
|
||||
typedef struct {
|
||||
// TODO: Define the platform specific variables required
|
||||
|
||||
RGFW_window *window; // Native display device (physical screen connection)
|
||||
} PlatformData;
|
||||
|
||||
@ -116,7 +114,7 @@ extern CoreData CORE; // Global CORE state context
|
||||
|
||||
static PlatformData platform = { NULL }; // Platform specific
|
||||
|
||||
static const unsigned short RGFWKeyToRayKey[] = {
|
||||
static const unsigned short keyMappingRGFW[] = {
|
||||
[RGFW_KEY_NULL] = KEY_NULL,
|
||||
[RGFW_Quote] = KEY_APOSTROPHE,
|
||||
[RGFW_Comma] = KEY_COMMA,
|
||||
@ -432,31 +430,32 @@ void SetWindowIcon(Image image)
|
||||
{
|
||||
i32 channels = 4;
|
||||
|
||||
switch (image.format) {
|
||||
switch (image.format)
|
||||
{
|
||||
case PIXELFORMAT_UNCOMPRESSED_GRAYSCALE:
|
||||
case PIXELFORMAT_UNCOMPRESSED_R16: // 16 bpp (1 channel - half float)
|
||||
case PIXELFORMAT_UNCOMPRESSED_R32: // 32 bpp (1 channel - float)
|
||||
{
|
||||
channels = 1;
|
||||
break;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA: // 8*2 bpp (2 channels)
|
||||
case PIXELFORMAT_UNCOMPRESSED_R5G6B5: // 16 bpp
|
||||
case PIXELFORMAT_UNCOMPRESSED_R8G8B8: // 24 bpp
|
||||
case PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: // 16 bpp (1 bit alpha)
|
||||
case PIXELFORMAT_UNCOMPRESSED_R4G4B4A4: // 16 bpp (4 bit alpha)
|
||||
case PIXELFORMAT_UNCOMPRESSED_R8G8B8A8: // 32 bpp
|
||||
{
|
||||
channels = 2;
|
||||
break;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R32G32B32: // 32*3 bpp (3 channels - float)
|
||||
case PIXELFORMAT_UNCOMPRESSED_R16G16B16: // 16*3 bpp (3 channels - half float)
|
||||
case PIXELFORMAT_COMPRESSED_DXT1_RGB: // 4 bpp (no alpha)
|
||||
case PIXELFORMAT_COMPRESSED_ETC1_RGB: // 4 bpp
|
||||
case PIXELFORMAT_COMPRESSED_ETC2_RGB: // 4 bpp
|
||||
case PIXELFORMAT_COMPRESSED_PVRT_RGB: // 4 bpp
|
||||
{
|
||||
channels = 3;
|
||||
break;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: // 32*4 bpp (4 channels - float)
|
||||
case PIXELFORMAT_UNCOMPRESSED_R16G16B16A16: // 16*4 bpp (4 channels - half float)
|
||||
case PIXELFORMAT_COMPRESSED_DXT1_RGBA: // 4 bpp (1 bit alpha)
|
||||
@ -466,9 +465,9 @@ void SetWindowIcon(Image image)
|
||||
case PIXELFORMAT_COMPRESSED_PVRT_RGBA: // 4 bpp
|
||||
case PIXELFORMAT_COMPRESSED_ASTC_4x4_RGBA: // 8 bpp
|
||||
case PIXELFORMAT_COMPRESSED_ASTC_8x8_RGBA: // 2 bpp
|
||||
{
|
||||
channels = 4;
|
||||
break;
|
||||
|
||||
} break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
@ -547,30 +546,36 @@ void *GetWindowHandle(void)
|
||||
// Get number of monitors
|
||||
int GetMonitorCount(void)
|
||||
{
|
||||
#define MAX_MONITORS_SUPPORTED 6
|
||||
|
||||
int count = MAX_MONITORS_SUPPORTED;
|
||||
RGFW_monitor *mons = RGFW_getMonitors();
|
||||
size_t i;
|
||||
for (i = 0; i < 6; i++) {
|
||||
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
if (!mons[i].rect.x && !mons[i].rect.y && !mons[i].rect.w && mons[i].rect.h)
|
||||
return i;
|
||||
{
|
||||
count = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return 6;
|
||||
return count;
|
||||
}
|
||||
|
||||
// Get number of monitors
|
||||
int GetCurrentMonitor(void)
|
||||
{
|
||||
int current = 0;
|
||||
RGFW_monitor *mons = RGFW_getMonitors();
|
||||
RGFW_monitor mon = RGFW_window_getMonitor(platform.window);
|
||||
|
||||
size_t i;
|
||||
for (i = 0; i < 6; i++) {
|
||||
if (mons[i].rect.x == mon.rect.x &&
|
||||
mons[i].rect.y == mon.rect.y)
|
||||
return i;
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
if ((mons[i].rect.x == mon.rect.x) && (mons[i].rect.y == mon.rect.y)) current = i;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return current;
|
||||
}
|
||||
|
||||
// Get selected monitor position
|
||||
@ -595,7 +600,6 @@ int GetMonitorHeight(int monitor)
|
||||
RGFW_monitor *mons = RGFW_getMonitors();
|
||||
|
||||
return mons[monitor].rect.h;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Get selected monitor physical width in millimetres
|
||||
@ -831,7 +835,8 @@ void PollInputEvents(void)
|
||||
while (RGFW_window_checkEvent(platform.window))
|
||||
{
|
||||
|
||||
if (platform.window->event.type >= RGFW_jsButtonPressed && platform.window->event.type <= RGFW_jsAxisMove) {
|
||||
if ((platform.window->event.type >= RGFW_jsButtonPressed) && (platform.window->event.type <= RGFW_jsAxisMove))
|
||||
{
|
||||
if (!CORE.Input.Gamepad.ready[platform.window->event.joystick])
|
||||
{
|
||||
CORE.Input.Gamepad.ready[platform.window->event.joystick] = true;
|
||||
@ -848,11 +853,10 @@ void PollInputEvents(void)
|
||||
switch (event->type)
|
||||
{
|
||||
case RGFW_quit: CORE.Window.shouldClose = true; break;
|
||||
|
||||
case RGFW_dnd: // Dropped file
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; i < event->droppedFilesCount; i++) {
|
||||
for (int i = 0; i < event->droppedFilesCount; i++)
|
||||
{
|
||||
if (CORE.Window.dropFileCount == 0)
|
||||
{
|
||||
// When a new file is dropped, we reserve a fixed number of slots for all possible dropped files
|
||||
@ -897,7 +901,8 @@ void PollInputEvents(void)
|
||||
{
|
||||
KeyboardKey key = ConvertScancodeToKey(event->keyCode);
|
||||
|
||||
if (key != KEY_NULL) {
|
||||
if (key != KEY_NULL)
|
||||
{
|
||||
// If key was up, add it to the key pressed queue
|
||||
if ((CORE.Input.Keyboard.currentKeyState[key] == 0) && (CORE.Input.Keyboard.keyPressedQueueCount < MAX_KEY_PRESSED_QUEUE))
|
||||
{
|
||||
@ -923,7 +928,6 @@ void PollInputEvents(void)
|
||||
CORE.Input.Keyboard.charPressedQueueCount++;
|
||||
}
|
||||
} break;
|
||||
|
||||
case RGFW_keyReleased:
|
||||
{
|
||||
KeyboardKey key = ConvertScancodeToKey(event->keyCode);
|
||||
@ -933,7 +937,8 @@ void PollInputEvents(void)
|
||||
// Check mouse events
|
||||
case RGFW_mouseButtonPressed:
|
||||
{
|
||||
if (event->button == RGFW_mouseScrollUp || event->button == RGFW_mouseScrollDown) {
|
||||
if ((event->button == RGFW_mouseScrollUp) || (event->button == RGFW_mouseScrollDown))
|
||||
{
|
||||
CORE.Input.Mouse.currentWheelMove.y = event->scroll;
|
||||
break;
|
||||
}
|
||||
@ -951,7 +956,8 @@ void PollInputEvents(void)
|
||||
case RGFW_mouseButtonReleased:
|
||||
{
|
||||
|
||||
if (event->button == RGFW_mouseScrollUp || event->button == RGFW_mouseScrollDown) {
|
||||
if ((event->button == RGFW_mouseScrollUp) || (event->button == RGFW_mouseScrollDown))
|
||||
{
|
||||
CORE.Input.Mouse.currentWheelMove.y = event->scroll;
|
||||
break;
|
||||
}
|
||||
@ -968,8 +974,8 @@ void PollInputEvents(void)
|
||||
} break;
|
||||
case RGFW_mousePosChanged:
|
||||
{
|
||||
if (platform.window->src.winArgs & RGFW_HOLD_MOUSE) {
|
||||
|
||||
if (platform.window->src.winArgs & RGFW_HOLD_MOUSE)
|
||||
{
|
||||
CORE.Input.Mouse.previousPosition = (Vector2){ 0.0f, 0.0f };
|
||||
|
||||
if ((event->point.x - (platform.window->r.w/2))*2)
|
||||
@ -980,7 +986,8 @@ void PollInputEvents(void)
|
||||
CORE.Input.Mouse.currentPosition.x = (event->point.x - (platform.window->r.w/2))*2;
|
||||
CORE.Input.Mouse.currentPosition.y = (event->point.y - (platform.window->r.h/2))*2;
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
CORE.Input.Mouse.previousPosition = CORE.Input.Mouse.currentPosition;
|
||||
CORE.Input.Mouse.currentPosition.x = (float)event->point.x;
|
||||
CORE.Input.Mouse.currentPosition.y = (float)event->point.y;
|
||||
@ -989,7 +996,6 @@ void PollInputEvents(void)
|
||||
CORE.Input.Touch.position[0] = CORE.Input.Mouse.currentPosition;
|
||||
touchAction = 2;
|
||||
} break;
|
||||
|
||||
case RGFW_jsButtonPressed:
|
||||
{
|
||||
int button = -1;
|
||||
@ -1061,25 +1067,30 @@ void PollInputEvents(void)
|
||||
case RGFW_jsAxisMove:
|
||||
{
|
||||
int axis = -1;
|
||||
|
||||
size_t i;
|
||||
for (i = 0; i < event->axisesCount; i++)
|
||||
for (int i = 0; i < event->axisesCount; i++)
|
||||
{
|
||||
switch(i)
|
||||
{
|
||||
switch(i) {
|
||||
case 0:
|
||||
if (abs(event->axis[i].x) > abs(event->axis[i].y)) {
|
||||
{
|
||||
if (abs(event->axis[i].x) > abs(event->axis[i].y))
|
||||
{
|
||||
axis = GAMEPAD_AXIS_LEFT_X;
|
||||
break;
|
||||
}
|
||||
|
||||
axis = GAMEPAD_AXIS_LEFT_Y;
|
||||
break;
|
||||
} break;
|
||||
case 1:
|
||||
if (abs(event->axis[i].x) > abs(event->axis[i].y)) {
|
||||
axis = GAMEPAD_AXIS_RIGHT_X; break;
|
||||
{
|
||||
if (abs(event->axis[i].x) > abs(event->axis[i].y))
|
||||
{
|
||||
axis = GAMEPAD_AXIS_RIGHT_X;
|
||||
break;
|
||||
}
|
||||
|
||||
axis = GAMEPAD_AXIS_RIGHT_Y; break;
|
||||
axis = GAMEPAD_AXIS_RIGHT_Y;
|
||||
} break;
|
||||
case 2: axis = GAMEPAD_AXIS_LEFT_TRIGGER; break;
|
||||
case 3: axis = GAMEPAD_AXIS_RIGHT_TRIGGER; break;
|
||||
default: break;
|
||||
@ -1137,9 +1148,7 @@ void PollInputEvents(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
if (RGFW_disableCursor && platform.window->event.inFocus)
|
||||
RGFW_window_mouseHold(platform.window, RGFW_AREA(0, 0));
|
||||
|
||||
if (RGFW_disableCursor && platform.window->event.inFocus) RGFW_window_mouseHold(platform.window, RGFW_AREA(0, 0));
|
||||
//-----------------------------------------------------------------------------
|
||||
}
|
||||
|
||||
@ -1151,15 +1160,7 @@ void PollInputEvents(void)
|
||||
// Initialize platform: graphics, inputs and more
|
||||
int InitPlatform(void)
|
||||
{
|
||||
// TODO: Initialize graphic device: display/window
|
||||
// It usually requires setting up the platform display system configuration
|
||||
// and connexion with the GPU through some system graphic API
|
||||
// raylib uses OpenGL so, platform should create that kind of connection
|
||||
// Below example illustrates that process using EGL library
|
||||
//----------------------------------------------------------------------------
|
||||
// Initialize RGFW internal global state, only required systems
|
||||
// Initialize graphic device: display/window and graphic context
|
||||
//----------------------------------------------------------------------------
|
||||
unsigned int flags = RGFW_CENTER | RGFW_ALLOW_DND;
|
||||
|
||||
// Check window creation flags
|
||||
@ -1241,7 +1242,7 @@ int InitPlatform(void)
|
||||
TRACELOG(LOG_INFO, " > Render size: %i x %i", CORE.Window.render.width, CORE.Window.render.height);
|
||||
TRACELOG(LOG_INFO, " > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y);
|
||||
|
||||
// TODO: Load OpenGL extensions
|
||||
// Load OpenGL extensions
|
||||
// NOTE: GL procedures address loader is required to load extensions
|
||||
//----------------------------------------------------------------------------
|
||||
rlLoadExtensions((void*)RGFW_getProcAddress);
|
||||
@ -1255,12 +1256,12 @@ int InitPlatform(void)
|
||||
// ...
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
// TODO: Initialize timing system
|
||||
// Initialize timing system
|
||||
//----------------------------------------------------------------------------
|
||||
InitTimer();
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
// TODO: Initialize storage system
|
||||
// Initialize storage system
|
||||
//----------------------------------------------------------------------------
|
||||
CORE.Storage.basePath = GetWorkingDirectory();
|
||||
//----------------------------------------------------------------------------
|
||||
@ -1281,14 +1282,12 @@ int InitPlatform(void)
|
||||
void ClosePlatform(void)
|
||||
{
|
||||
RGFW_window_close(platform.window);
|
||||
// TODO: De-initialize graphics, inputs and more
|
||||
}
|
||||
|
||||
// Keycode mapping
|
||||
static KeyboardKey ConvertScancodeToKey(u32 keycode)
|
||||
{
|
||||
if (keycode > sizeof(keyMappingRGFW)/sizeof(unsigned short)) return 0;
|
||||
|
||||
static KeyboardKey ConvertScancodeToKey(u32 keycode) {
|
||||
if (keycode > sizeof(RGFWKeyToRayKey) / sizeof(unsigned short))
|
||||
return 0;
|
||||
|
||||
return RGFWKeyToRayKey[keycode];
|
||||
return keyMappingRGFW[keycode];
|
||||
}
|
||||
// EOF
|
@ -1132,7 +1132,8 @@ void PollInputEvents(void)
|
||||
{
|
||||
KeyboardKey key = ConvertScancodeToKey(event.key.keysym.scancode);
|
||||
|
||||
if (key != KEY_NULL) {
|
||||
if (key != KEY_NULL)
|
||||
{
|
||||
// If key was up, add it to the key pressed queue
|
||||
if ((CORE.Input.Keyboard.currentKeyState[key] == 0) && (CORE.Input.Keyboard.keyPressedQueueCount < MAX_KEY_PRESSED_QUEUE))
|
||||
{
|
||||
|
@ -1136,7 +1136,8 @@ void ClosePlatform(void)
|
||||
|
||||
// Close the evdev devices
|
||||
|
||||
if (platform.mouseFd != -1) {
|
||||
if (platform.mouseFd != -1)
|
||||
{
|
||||
close(platform.mouseFd);
|
||||
platform.mouseFd = -1;
|
||||
}
|
||||
@ -1924,9 +1925,7 @@ static int FindNearestConnectorMode(const drmModeConnector *connector, uint widt
|
||||
const int nearestHeightDiff = abs(platform.connector->modes[nearestIndex].vdisplay - height);
|
||||
const int nearestFpsDiff = abs(platform.connector->modes[nearestIndex].vrefresh - fps);
|
||||
|
||||
if ((widthDiff < nearestWidthDiff) || (heightDiff < nearestHeightDiff) || (fpsDiff < nearestFpsDiff)) {
|
||||
nearestIndex = i;
|
||||
}
|
||||
if ((widthDiff < nearestWidthDiff) || (heightDiff < nearestHeightDiff) || (fpsDiff < nearestFpsDiff)) nearestIndex = i;
|
||||
}
|
||||
|
||||
return nearestIndex;
|
||||
|
@ -1332,9 +1332,9 @@ RLAPI Image GenImageText(int width, int height, const char *text);
|
||||
// Image manipulation functions
|
||||
RLAPI Image ImageCopy(Image image); // Create an image duplicate (useful for transformations)
|
||||
RLAPI Image ImageFromImage(Image image, Rectangle rec); // Create an image from another image piece
|
||||
RLAPI Image ImageFromChannel(Image image, int selectedChannel); // Create an image from a selected channel of another image (GRAYSCALE/R16/R32)
|
||||
RLAPI Image ImageText(const char *text, int fontSize, Color color); // Create an image from text (default font)
|
||||
RLAPI Image ImageTextEx(Font font, const char *text, float fontSize, float spacing, Color tint); // Create an image from text (custom sprite font)
|
||||
RLAPI Image ImageFromChannel(Image image, int selectedChannel); // Create an image from a selected channel of another image
|
||||
RLAPI void ImageFormat(Image *image, int newFormat); // Convert image data to desired format
|
||||
RLAPI void ImageToPOT(Image *image, Color fill); // Convert image to POT (power-of-two)
|
||||
RLAPI void ImageCrop(Image *image, Rectangle crop); // Crop an image to a defined rectangle
|
||||
|
@ -2533,7 +2533,7 @@ RMAPI void MatrixDecompose(Matrix mat, Vector3 *translation, Quaternion *rotatio
|
||||
translation->y = mat.m13;
|
||||
translation->z = mat.m14;
|
||||
|
||||
// Extract upper-left for determinant computation.
|
||||
// Extract upper-left for determinant computation
|
||||
const float a = mat.m0;
|
||||
const float b = mat.m4;
|
||||
const float c = mat.m8;
|
||||
@ -2547,7 +2547,7 @@ RMAPI void MatrixDecompose(Matrix mat, Vector3 *translation, Quaternion *rotatio
|
||||
const float B = f*g - d*i;
|
||||
const float C = d*h - e*g;
|
||||
|
||||
// Extract scale.
|
||||
// Extract scale
|
||||
const float det = a*A + b*B + c*C;
|
||||
float scalex = Vector3Length((Vector3){ a, b, c });
|
||||
float scaley = Vector3Length((Vector3){ d, e, f });
|
||||
@ -2558,13 +2558,14 @@ RMAPI void MatrixDecompose(Matrix mat, Vector3 *translation, Quaternion *rotatio
|
||||
|
||||
*scale = s;
|
||||
|
||||
// Remove scale from the matrix if it is not close to zero.
|
||||
// Remove scale from the matrix if it is not close to zero
|
||||
Matrix clone = mat;
|
||||
if (!FloatEquals(det, 0))
|
||||
{
|
||||
clone.m0 /= s.x;
|
||||
clone.m5 /= s.y;
|
||||
clone.m10 /= s.z;
|
||||
|
||||
// Extract rotation
|
||||
*rotation = QuaternionFromMatrix(clone);
|
||||
}
|
||||
|
126
src/rtextures.c
126
src/rtextures.c
@ -1636,19 +1636,18 @@ Image ImageFromChannel(Image image, int selectedChannel)
|
||||
Image result = { 0 };
|
||||
|
||||
// Security check to avoid program crash
|
||||
if ((image.data == NULL) || (image.width == 0) || (image.height == 0))
|
||||
return result;
|
||||
if ((image.data == NULL) || (image.width == 0) || (image.height == 0)) return result;
|
||||
|
||||
// Check selected channel
|
||||
// Check selected channel is valid
|
||||
if (selectedChannel < 0)
|
||||
{
|
||||
TRACELOG(LOG_WARNING, "Channel cannot be negative. Setting channel to 0.");
|
||||
selectedChannel = 0;
|
||||
}
|
||||
if (image.format == PIXELFORMAT_UNCOMPRESSED_GRAYSCALE
|
||||
|| image.format == PIXELFORMAT_UNCOMPRESSED_R32
|
||||
|| image.format == PIXELFORMAT_UNCOMPRESSED_R16
|
||||
)
|
||||
|
||||
if (image.format == PIXELFORMAT_UNCOMPRESSED_GRAYSCALE ||
|
||||
image.format == PIXELFORMAT_UNCOMPRESSED_R32 ||
|
||||
image.format == PIXELFORMAT_UNCOMPRESSED_R16)
|
||||
{
|
||||
if (selectedChannel > 0)
|
||||
{
|
||||
@ -1664,11 +1663,10 @@ Image ImageFromChannel(Image image, int selectedChannel)
|
||||
selectedChannel = 1;
|
||||
}
|
||||
}
|
||||
else if (image.format == PIXELFORMAT_UNCOMPRESSED_R5G6B5
|
||||
|| image.format == PIXELFORMAT_UNCOMPRESSED_R8G8B8
|
||||
|| image.format == PIXELFORMAT_UNCOMPRESSED_R32G32B32
|
||||
|| image.format == PIXELFORMAT_UNCOMPRESSED_R16G16B16
|
||||
)
|
||||
else if (image.format == PIXELFORMAT_UNCOMPRESSED_R5G6B5 ||
|
||||
image.format == PIXELFORMAT_UNCOMPRESSED_R8G8B8 ||
|
||||
image.format == PIXELFORMAT_UNCOMPRESSED_R32G32B32 ||
|
||||
image.format == PIXELFORMAT_UNCOMPRESSED_R16G16B16)
|
||||
{
|
||||
if (selectedChannel > 2)
|
||||
{
|
||||
@ -1677,153 +1675,121 @@ Image ImageFromChannel(Image image, int selectedChannel)
|
||||
}
|
||||
}
|
||||
|
||||
// formats rgba
|
||||
// Check for RGBA formats
|
||||
if (selectedChannel > 3)
|
||||
{
|
||||
TRACELOG(LOG_WARNING, "ImageFromChannel supports channels 0 to 3 (rgba). Setting channel to alpha.");
|
||||
selectedChannel = 3;
|
||||
}
|
||||
|
||||
// TODO: Consider other one-channel formats: R16, R32
|
||||
result.format = PIXELFORMAT_UNCOMPRESSED_GRAYSCALE;
|
||||
result.height = image.height;
|
||||
result.width = image.width;
|
||||
result.mipmaps = 1;
|
||||
|
||||
unsigned char *pixels = (unsigned char *)RL_CALLOC(image.width * image.height, sizeof(unsigned char)); // values 0 to 255
|
||||
unsigned char *pixels = (unsigned char *)RL_CALLOC(image.width*image.height, sizeof(unsigned char)); // Values from 0 to 255
|
||||
|
||||
if (image.format >= PIXELFORMAT_COMPRESSED_DXT1_RGB) TRACELOG(LOG_WARNING, "IMAGE: Pixel data retrieval not supported for compressed image formats");
|
||||
else
|
||||
{
|
||||
for (int i = 0, k = 0; i < image.width * image.height; ++i)
|
||||
for (int i = 0, k = 0; i < image.width*image.height; i++)
|
||||
{
|
||||
float imageValue = -1;
|
||||
float pixelValue = -1;
|
||||
switch (image.format)
|
||||
{
|
||||
case PIXELFORMAT_UNCOMPRESSED_GRAYSCALE:
|
||||
{
|
||||
imageValue = (float)((unsigned char *)image.data)[i + selectedChannel]/255.0f;
|
||||
pixelValue = (float)((unsigned char *)image.data)[i + selectedChannel]/255.0f;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_GRAY_ALPHA:
|
||||
{
|
||||
imageValue = (float)((unsigned char *)image.data)[k + selectedChannel]/255.0f;
|
||||
|
||||
pixelValue = (float)((unsigned char *)image.data)[k + selectedChannel]/255.0f;
|
||||
k += 2;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R5G5B5A1:
|
||||
{
|
||||
unsigned short pixel = ((unsigned short *)image.data)[i];
|
||||
|
||||
if (selectedChannel == 0)
|
||||
{
|
||||
imageValue = (float)((pixel & 0b1111100000000000) >> 11)*(1.0f/31);
|
||||
}
|
||||
else if (selectedChannel == 1)
|
||||
{
|
||||
imageValue = (float)((pixel & 0b0000011111000000) >> 6)*(1.0f/31);
|
||||
}
|
||||
else if (selectedChannel == 2)
|
||||
{
|
||||
imageValue = (float)((pixel & 0b0000000000111110) >> 1)*(1.0f/31);
|
||||
}
|
||||
else if (selectedChannel == 3)
|
||||
{
|
||||
imageValue = ((pixel & 0b0000000000000001) == 0)? 0.0f : 1.0f;
|
||||
}
|
||||
if (selectedChannel == 0) pixelValue = (float)((pixel & 0b1111100000000000) >> 11)*(1.0f/31);
|
||||
else if (selectedChannel == 1) pixelValue = (float)((pixel & 0b0000011111000000) >> 6)*(1.0f/31);
|
||||
else if (selectedChannel == 2) pixelValue = (float)((pixel & 0b0000000000111110) >> 1)*(1.0f/31);
|
||||
else if (selectedChannel == 3) pixelValue = ((pixel & 0b0000000000000001) == 0)? 0.0f : 1.0f;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R5G6B5:
|
||||
{
|
||||
unsigned short pixel = ((unsigned short *)image.data)[i];
|
||||
|
||||
if (selectedChannel == 0)
|
||||
{
|
||||
imageValue = (float)((pixel & 0b1111100000000000) >> 11)*(1.0f/31);
|
||||
}
|
||||
else if (selectedChannel == 1)
|
||||
{
|
||||
imageValue = (float)((pixel & 0b0000011111100000) >> 5)*(1.0f/63);
|
||||
}
|
||||
else if (selectedChannel == 2)
|
||||
{
|
||||
imageValue = (float)(pixel & 0b0000000000011111)*(1.0f/31);
|
||||
}
|
||||
if (selectedChannel == 0) pixelValue = (float)((pixel & 0b1111100000000000) >> 11)*(1.0f/31);
|
||||
else if (selectedChannel == 1) pixelValue = (float)((pixel & 0b0000011111100000) >> 5)*(1.0f/63);
|
||||
else if (selectedChannel == 2) pixelValue = (float)(pixel & 0b0000000000011111)*(1.0f/31);
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R4G4B4A4:
|
||||
{
|
||||
unsigned short pixel = ((unsigned short *)image.data)[i];
|
||||
|
||||
if (selectedChannel == 0)
|
||||
{
|
||||
imageValue = (float)((pixel & 0b1111000000000000) >> 12)*(1.0f/15);
|
||||
}
|
||||
else if (selectedChannel == 1)
|
||||
{
|
||||
imageValue = (float)((pixel & 0b0000111100000000) >> 8)*(1.0f/15);
|
||||
}
|
||||
else if (selectedChannel == 2)
|
||||
{
|
||||
imageValue = (float)((pixel & 0b0000000011110000) >> 4)*(1.0f/15);
|
||||
}
|
||||
else if (selectedChannel == 3)
|
||||
{
|
||||
imageValue = (float)(pixel & 0b0000000000001111)*(1.0f/15);
|
||||
}
|
||||
if (selectedChannel == 0) pixelValue = (float)((pixel & 0b1111000000000000) >> 12)*(1.0f/15);
|
||||
else if (selectedChannel == 1) pixelValue = (float)((pixel & 0b0000111100000000) >> 8)*(1.0f/15);
|
||||
else if (selectedChannel == 2) pixelValue = (float)((pixel & 0b0000000011110000) >> 4)*(1.0f/15);
|
||||
else if (selectedChannel == 3) pixelValue = (float)(pixel & 0b0000000000001111)*(1.0f/15);
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R8G8B8A8:
|
||||
{
|
||||
imageValue = (float)((unsigned char *)image.data)[k + selectedChannel]/255.0f;
|
||||
|
||||
pixelValue = (float)((unsigned char *)image.data)[k + selectedChannel]/255.0f;
|
||||
k += 4;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R8G8B8:
|
||||
{
|
||||
imageValue = (float)((unsigned char *)image.data)[k + selectedChannel]/255.0f;
|
||||
|
||||
pixelValue = (float)((unsigned char *)image.data)[k + selectedChannel]/255.0f;
|
||||
k += 3;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R32:
|
||||
{
|
||||
imageValue = ((float *)image.data)[k];
|
||||
|
||||
pixelValue = ((float *)image.data)[k];
|
||||
k += 1;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R32G32B32:
|
||||
{
|
||||
imageValue = ((float *)image.data)[k + selectedChannel];
|
||||
|
||||
pixelValue = ((float *)image.data)[k + selectedChannel];
|
||||
k += 3;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R32G32B32A32:
|
||||
{
|
||||
imageValue = ((float *)image.data)[k + selectedChannel];
|
||||
|
||||
pixelValue = ((float *)image.data)[k + selectedChannel];
|
||||
k += 4;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R16:
|
||||
{
|
||||
imageValue = HalfToFloat(((unsigned short *)image.data)[k]);
|
||||
|
||||
pixelValue = HalfToFloat(((unsigned short *)image.data)[k]);
|
||||
k += 1;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R16G16B16:
|
||||
{
|
||||
imageValue = HalfToFloat(((unsigned short *)image.data)[k+selectedChannel]);
|
||||
|
||||
pixelValue = HalfToFloat(((unsigned short *)image.data)[k+selectedChannel]);
|
||||
k += 3;
|
||||
|
||||
} break;
|
||||
case PIXELFORMAT_UNCOMPRESSED_R16G16B16A16:
|
||||
{
|
||||
imageValue = HalfToFloat(((unsigned short *)image.data)[k + selectedChannel]);
|
||||
|
||||
pixelValue = HalfToFloat(((unsigned short *)image.data)[k + selectedChannel]);
|
||||
k += 4;
|
||||
|
||||
} break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
pixels[i] = imageValue * 255;
|
||||
pixels[i] = (unsigned char)(pixelValue*255);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user