VAR/GameLib
1
1
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Code formating on Draw.c

Browse Source
This commit is contained in:
Valeriano A.R.
2018-04-22 23:12:45 +02:00
committed by Valeriano A.R
parent f7b20de3a7
commit ab200e42bb
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
GameLib/Draw.c
View File

@@ -3,24 +3,24 @@
#ifdef WIN32 #ifdef WIN32
// Windows // Windows
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <windows.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h> #include <GL/glext.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <windows.h>
#define USE_OpenGL 1 #define USE_OpenGL 1
#define USE_OpenGLES 0 #define USE_OpenGLES 0
#include <unistd.h> #include <unistd.h>
#else #else
#ifdef EMSCRIPTEN #ifdef EMSCRIPTEN
// Emscripten // Emscripten
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define GL_GLEXT_PROTOTYPES 1 #define GL_GLEXT_PROTOTYPES 1
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include <emscripten.h> #include <emscripten.h>
@@ -30,11 +30,11 @@
#include <unistd.h> #include <unistd.h>
#else #else
// UNIX // UNIX
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define USE_OpenGL 1 #define USE_OpenGL 1
#define USE_OpenGLES 0 #define USE_OpenGLES 0
#include <unistd.h> #include <unistd.h>
@@ -47,12 +47,12 @@
#define GL_CLAMP_TO_EDGE 0x812F #define GL_CLAMP_TO_EDGE 0x812F
#endif #endif
#include "Audio.h"
#include "Draw.h"
#include "Input.h"
#include "QuadArray2D.h"
#include "Time.h" #include "Time.h"
#include "Util.h" #include "Util.h"
#include "QuadArray2D.h"
#include "Audio.h"
#include "Input.h"
#include "Draw.h"
//////////////////////////////////////////////// ////////////////////////////////////////////////
// DrawImage // // DrawImage //
@@ -747,7 +747,7 @@ void Draw_DrawImg(DrawImg img, int x, int y, float scale[2]) {
y1 = y + (image->y * scale[1]); y1 = y + (image->y * scale[1]);
x2 = x1 + (image->w * scale[0]); x2 = x1 + (image->w * scale[0]);
y2 = y1 + (image->h * scale[1]); y2 = y1 + (image->h * scale[1]);
// Apply flipping // Apply flipping
if (image->flip & 1) { if (image->flip & 1) {
float t = u1; float t = u1;
@@ -808,7 +808,8 @@ void Draw_DrawImgResized(DrawImg img, int x, int y, float w, float h) {
// Draw_DrawImgPart // Draw_DrawImgPart
// //
// Draws an image part. // Draws an image part.
void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j, float scale[2]) { void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j,
float scale[2]) {
DrawImage image = img; DrawImage image = img;
int x1, x2, y1, y2; int x1, x2, y1, y2;
float us, u1, u2; float us, u1, u2;
@@ -819,7 +820,7 @@ void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j, flo
y1 = y + (image->y * scale[1]); y1 = y + (image->y * scale[1]);
x2 = x1 + (w * scale[0]); x2 = x1 + (w * scale[0]);
y2 = y1 + (h * scale[1]); y2 = y1 + (h * scale[1]);
// Prepare image coordinates // Prepare image coordinates
us = 1.0f / image->w; us = 1.0f / image->w;
u1 = us * i * w; u1 = us * i * w;
@@ -852,7 +853,8 @@ void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j, flo
// Draw_DrawImgPartHoriz // Draw_DrawImgPartHoriz
// //
// Draws an image part horizontally. // Draws an image part horizontally.
void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i, float scale[2]) { void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i,
float scale[2]) {
DrawImage image = img; DrawImage image = img;
int x1, x2, y1, y2; int x1, x2, y1, y2;
float us, u1, u2; float us, u1, u2;
@@ -863,7 +865,7 @@ void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i, float scale[
y1 = y + (image->y * scale[1]); y1 = y + (image->y * scale[1]);
x2 = x1 + (w * scale[0]); x2 = x1 + (w * scale[0]);
y2 = y1 + (image->h * scale[1]); y2 = y1 + (image->h * scale[1]);
// Prepare image coordinates // Prepare image coordinates
us = 1.0f / image->w; us = 1.0f / image->w;
u1 = us * i * w; u1 = us * i * w;
@@ -1041,7 +1043,8 @@ void Draw_DrawText(DrawFnt f, char *text, int x, int y) {
ptr = text; ptr = text;
while (*ptr) { while (*ptr) {
if ((*ptr) < font->max) { if ((*ptr) < font->max) {
Draw_DrawImgPartHoriz(font->img, x, y, font->w, (*ptr) - font->min, font->scale); Draw_DrawImgPartHoriz(font->img, x, y, font->w, (*ptr) - font->min,
font->scale);
} }
x += font->w * font->scale[0]; x += font->w * font->scale[0];
ptr++; ptr++;