Reformat code

.clang-format

@@ -2,32 +2,30 @@
 Language: Cpp
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -2
-AlignAfterOpenBracket: true
+AlignAfterOpenBracket: AlwaysBreak
-AlignEscapedNewlinesLeft: false
 AlignOperands: true
 AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Always
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AlwaysBreakAfterDefinitionReturnType: false
+AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakTemplateDeclarations: false
+AlwaysBreakTemplateDeclarations: No
 AlwaysBreakBeforeMultilineStrings: false
 BreakBeforeBinaryOperators: None
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BinPackParameters: true
-BinPackArguments: true
+BinPackArguments: false
-ColumnLimit:     80
+ColumnLimit: 120
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 DerivePointerAlignment: false
 ExperimentalAutoDetectBinPacking: false
 IndentCaseLabels: false
 IndentWrappedFunctionNames: false
-IndentFunctionDeclarationAfterType: false
 MaxEmptyLinesToKeep: 1
 KeepEmptyLinesAtTheStartOfBlocks: true
 NamespaceIndentation: None
@@ -43,10 +41,10 @@ PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 SpacesBeforeTrailingComments: 1
 Cpp11BracedListStyle: true
-Standard:        Cpp11
+Standard: c++11
 IndentWidth: 4
 TabWidth: 4
-UseTab:          true
+UseTab: AlignWithSpaces
 BreakBeforeBraces: Attach
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
@@ -57,9 +55,9 @@ SpaceAfterCStyleCast: false
 SpacesInContainerLiterals: true
 SpaceBeforeAssignmentOperators: true
 ContinuationIndentWidth: 4
-CommentPragmas:  '^ IWYU pragma:'
 ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
 SpaceBeforeParens: ControlStatements
 DisableFormat: false
+AlignConsecutiveAssignments: Consecutive
 ...
 

Example.GameLib/.clang-format

@@ -2,32 +2,30 @@
 Language: Cpp
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -2
-AlignAfterOpenBracket: true
+AlignAfterOpenBracket: AlwaysBreak
-AlignEscapedNewlinesLeft: false
 AlignOperands: true
 AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Always
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AlwaysBreakAfterDefinitionReturnType: false
+AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakTemplateDeclarations: false
+AlwaysBreakTemplateDeclarations: No
 AlwaysBreakBeforeMultilineStrings: false
 BreakBeforeBinaryOperators: None
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BinPackParameters: true
-BinPackArguments: true
+BinPackArguments: false
-ColumnLimit:     80
+ColumnLimit: 120
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 DerivePointerAlignment: false
 ExperimentalAutoDetectBinPacking: false
 IndentCaseLabels: false
 IndentWrappedFunctionNames: false
-IndentFunctionDeclarationAfterType: false
 MaxEmptyLinesToKeep: 1
 KeepEmptyLinesAtTheStartOfBlocks: true
 NamespaceIndentation: None
@@ -43,10 +41,10 @@ PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 SpacesBeforeTrailingComments: 1
 Cpp11BracedListStyle: true
-Standard:        Cpp11
+Standard: c++11
 IndentWidth: 4
 TabWidth: 4
-UseTab:          true
+UseTab: AlignWithSpaces
 BreakBeforeBraces: Attach
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
@@ -57,9 +55,9 @@ SpaceAfterCStyleCast: false
 SpacesInContainerLiterals: true
 SpaceBeforeAssignmentOperators: true
 ContinuationIndentWidth: 4
-CommentPragmas:  '^ IWYU pragma:'
 ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
 SpaceBeforeParens: ControlStatements
 DisableFormat: false
+AlignConsecutiveAssignments: Consecutive
 ...
 

Example.GameLib/src/GameEnts.c

@@ -48,8 +48,7 @@ void Player_Proc(Entity e, int ft) {
 	Entity_SetScale(e, entityScale);
 
 	if (e->A > 0) {
-		if (Input_GetKey(InputKey_Jump) == InputKey_Pressed ||
+		if (Input_GetKey(InputKey_Jump) == InputKey_Pressed || Input_GetKey(InputKey_Up) == InputKey_Pressed) {
-			Input_GetKey(InputKey_Up) == InputKey_Pressed) {
 
 			// Apply jump
 			if (e->vel[1] > (-jumpVel)) {
@@ -91,8 +90,7 @@ void Player_Proc(Entity e, int ft) {
 			Entity_AddVelLimit(e, right, maxVel * airMovementFactor);
 		}
 	}
-	if (Input_GetKey(InputKey_Action1) == InputKey_Pressed ||
+	if (Input_GetKey(InputKey_Action1) == InputKey_Pressed || Input_GetKey(InputKey_Action2) == InputKey_Pressed) {
-		Input_GetKey(InputKey_Action2) == InputKey_Pressed) {
 		Entity_SetScale(e, (float[2]){1.0f, 1.0f});
 	}
 
@@ -114,14 +112,12 @@ int Player_Collision(Entity ent, Entity ent2, float t, vec2 n) {
 	if (fabs(n[0]) > fabs(n[1])) {
 		float intensity = (fabs(ent->vel[0]) - 10.0f) / 40.0f;
 		if (intensity > 0) {
-			Entity_SetScale(ent, (float[2]){1.0f - (0.3f * intensity),
+			Entity_SetScale(ent, (float[2]){1.0f - (0.3f * intensity), 1.0f + (0.3f * intensity)});
-											1.0f + (0.3f * intensity)});
 		}
 	} else {
 		float intensity = (fabs(ent->vel[1]) - 10.0f) / 40.0f;
 		if (intensity > 0) {
-			Entity_SetScale(ent, (float[2]){1.0f + (0.3f * intensity),
+			Entity_SetScale(ent, (float[2]){1.0f + (0.3f * intensity), 1.0f - (0.3f * intensity)});
-											1.0f - (0.3f * intensity)});
 		}
 	}
 	return -1;

Example.GameLib/src/main.c

@@ -59,8 +59,7 @@ int main(int argc, char *argv[]) {
 	// Run the world.
 	//
 	GameLib_CleanParallaxBackgrounds();
-	GameLib_AddParallaxBackground(imgBackground, (int[2]){512, 512},
+	GameLib_AddParallaxBackground(imgBackground, (int[2]){512, 512}, (int[2]){0, 0}, (float[2]){0.5f, 0.0f});
-								  (int[2]){0, 0}, (float[2]){0.5f, 0.0f});
 	GameLib_Loop(ProcGame, PostProcGame, PreDrawGame, DrawGame);
 
 	return (0);

macosx/SDLMain.m

@@ -5,8 +5,8 @@
     Feel free to customize this file to suit your needs
 */
 
-#include <SDL.h>
 #import <Cocoa/Cocoa.h>
+#include <SDL.h>
 
 @interface SDLMain : NSObject
 @end
@@ -28,14 +28,14 @@
 #define SDL_USE_CPS 1
 #ifdef SDL_USE_CPS
 /* Portions of CPS.h */
-typedef struct CPSProcessSerNum
+typedef struct CPSProcessSerNum {
-{
 	UInt32 lo;
 	UInt32 hi;
 } CPSProcessSerNum;
 
 extern OSErr CPSGetCurrentProcess(CPSProcessSerNum *psn);
-extern OSErr 	CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
+extern OSErr
+CPSEnableForegroundOperation(CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
 extern OSErr CPSSetFrontProcess(CPSProcessSerNum *psn);
 
 #endif /* SDL_USE_CPS */
@@ -45,8 +45,7 @@ static char  **gArgv;
 static BOOL gFinderLaunch;
 static BOOL gCalledAppMainline = FALSE;
 
-static NSString *getApplicationName(void)
+static NSString *getApplicationName(void) {
-{
 	const NSDictionary *dict;
 	NSString *appName = 0;
 
@@ -73,8 +72,7 @@ static NSString *getApplicationName(void)
 
 @implementation NSApplication (SDLApplication)
 /* Invoked from the Quit menu item */
-- (void)terminate:(id)sender
+- (void)terminate:(id)sender {
-{
 	/* Post a SDL_QUIT event */
 	SDL_Event event;
 	event.type = SDL_QUIT;
@@ -86,10 +84,8 @@ static NSString *getApplicationName(void)
 @implementation SDLMain
 
 /* Set the working directory to the .app's parent directory */
-- (void) setupWorkingDirectory:(BOOL)shouldChdir
+- (void)setupWorkingDirectory:(BOOL)shouldChdir {
-{
+	if (shouldChdir) {
-    if (shouldChdir)
-    {
 		char parentdir[MAXPATHLEN];
 		CFURLRef url  = CFBundleCopyBundleURL(CFBundleGetMainBundle());
 		CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url);
@@ -104,8 +100,7 @@ static NSString *getApplicationName(void)
 #if SDL_USE_NIB_FILE
 
 /* Fix menu to contain the real app name instead of "SDL App" */
-- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName
+- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName {
-{
 	NSRange aRange;
 	NSEnumerator *enumerator;
 	NSMenuItem *menuItem;
@@ -115,8 +110,7 @@ static NSString *getApplicationName(void)
 		[aMenu setTitle:[[aMenu title] stringByReplacingRange:aRange with:appName]];
 
 	enumerator = [[aMenu itemArray] objectEnumerator];
-    while ((menuItem = [enumerator nextObject]))
+	while ((menuItem = [enumerator nextObject])) {
-    {
 		aRange = [[menuItem title] rangeOfString:@"SDL App"];
 		if (aRange.length != 0)
 			[menuItem setTitle:[[menuItem title] stringByReplacingRange:aRange with:appName]];
@@ -127,8 +121,7 @@ static NSString *getApplicationName(void)
 
 #else
 
-static void setApplicationMenu(void)
+static void setApplicationMenu(void) {
-{
 	/* warning: this code is very odd */
 	NSMenu *appleMenu;
 	NSMenuItem *menuItem;
@@ -147,7 +140,9 @@ static void setApplicationMenu(void)
 	title = [@"Hide " stringByAppendingString:appName];
 	[appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
 
-    menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
+	menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others"
+												  action:@selector(hideOtherApplications:)
+										   keyEquivalent:@"h"];
 	[menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask | NSCommandKeyMask)];
 
 	[appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
@@ -157,7 +152,6 @@ static void setApplicationMenu(void)
 	title = [@"Quit " stringByAppendingString:appName];
 	[appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
 
-    
 	/* Put menu into the menubar */
 	menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
 	[menuItem setSubmenu:appleMenu];
@@ -172,8 +166,7 @@ static void setApplicationMenu(void)
 }
 
 /* Create a window menu */
-static void setupWindowMenu(void)
+static void setupWindowMenu(void) {
-{
 	NSMenu *windowMenu;
 	NSMenuItem *windowMenuItem;
 	NSMenuItem *menuItem;
@@ -199,8 +192,7 @@ static void setupWindowMenu(void)
 }
 
 /* Replacement for NSApplicationMain */
-static void CustomApplicationMain (int argc, char **argv)
+static void CustomApplicationMain(int argc, char **argv) {
-{
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	SDLMain *sdlMain;
 
@@ -236,7 +228,6 @@ static void CustomApplicationMain (int argc, char **argv)
 
 #endif
 
-
 /*
  * Catch document open requests...this lets us notice files when the app
  *  was launched by double-clicking a document, or when a document was
@@ -252,8 +243,7 @@ static void CustomApplicationMain (int argc, char **argv)
  *
  * This message is ignored once the app's mainline has been called.
  */
-- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
+- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename {
-{
 	const char *temparg;
 	size_t arglen;
 	char *arg;
@@ -272,8 +262,7 @@ static void CustomApplicationMain (int argc, char **argv)
 		return FALSE;
 
 	newargv = (char **)realloc(gArgv, sizeof(char *) * (gArgc + 2));
-    if (newargv == NULL)
+	if (newargv == NULL) {
-    {
 		SDL_free(arg);
 		return FALSE;
 	}
@@ -285,10 +274,8 @@ static void CustomApplicationMain (int argc, char **argv)
 	return TRUE;
 }
 
-
 /* Called when the internal event loop has just started running */
-- (void) applicationDidFinishLaunching: (NSNotification *) note
+- (void)applicationDidFinishLaunching:(NSNotification *)note {
-{
 	int status;
 
 	/* Set the working directory to the .app's parent directory */
@@ -308,11 +295,9 @@ static void CustomApplicationMain (int argc, char **argv)
 }
 @end
 
-
 @implementation NSString (ReplaceSubString)
 
-- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
+- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString {
-{
 	unsigned int bufferSize;
 	unsigned int selfLen    = [self length];
 	unsigned int aStringLen = [aString length];
@@ -348,16 +333,12 @@ static void CustomApplicationMain (int argc, char **argv)
 
 @end
 
-
-
 #ifdef main
 #undef main
 #endif
 
-
 /* Main entry point to executable - should *not* be SDL_main! */
-int main (int argc, char **argv)
+int main(int argc, char **argv) {
-{
 	/* Copy the arguments into a global variable */
 	/* This is passed if we are launched by double-clicking */
 	if (argc >= 2 && strncmp(argv[1], "-psn", 4) == 0) {

src/Anim.c

@@ -159,8 +159,7 @@ void AnimPlay_SetAnim(AnimPlay *ap, Anim ani) {
 
 	ap->imgPart = NULL;
 }
-void AnimPlay_SetImgPart(AnimPlay *ap, DrawImg img, int w, int h, int i,
+void AnimPlay_SetImgPart(AnimPlay *ap, DrawImg img, int w, int h, int i, int j) {
-						 int j) {
 	ap->anim    = NULL;
 	ap->time_ms = 0;
 
@@ -187,8 +186,7 @@ void AnimPlay_Draw(AnimPlay *ani, int x, int y, float scale[2]) {
 		return;
 	}
 	if (ani->imgPart) {
-		Draw_DrawImgPart(ani->imgPart, x, y, ani->w, ani->h, ani->i, ani->j,
+		Draw_DrawImgPart(ani->imgPart, x, y, ani->w, ani->h, ani->i, ani->j, scale);
-						 scale);
 		return;
 	}
 }

src/Audio.c

@@ -174,8 +174,7 @@ static void Audio_MixerCallback(void *ud, Uint8 *stream, int l) {
 
 			// Next sample
 			ptr_out += 2;
-			if (ptr_wave >=
+			if (ptr_wave >= (((signed short *)wave->buffer) + (wave->len - 1))) {
-				(((signed short *)wave->buffer) + (wave->len - 1))) {
 				ptr_wave = ((signed short *)wave->buffer);
 			} else {
 				ptr_wave++;
@@ -260,9 +259,12 @@ AudioSnd Audio_LoadSound(char *filename) {
 
 	// Assert sound format
 	if (sampleRate != 44100 || channels != 1 || bitsPerSample != 2) {
-		Print("Audio_LoadSound: Format not supported: "
+		Print(
+			"Audio_LoadSound: Format not supported: "
 			"sampleRate:%d; channels:%d; BPB:%d\n",
-			  sampleRate, channels, bitsPerSample);
+			sampleRate,
+			channels,
+			bitsPerSample);
 		fclose(f);
 		return (NULL);
 	}
@@ -313,8 +315,7 @@ AudioSnd Audio_LoadSound(char *filename) {
 // Audio_PlaySound
 //
 // Loads a sound, giving a reference.
-AudioChn Audio_PlaySound(AudioSnd snd, float leftvol, float rightvol,
+AudioChn Audio_PlaySound(AudioSnd snd, float leftvol, float rightvol, int loop) {
-						 int loop) {
 	AudioChan chan;
 	AudioWave wave;
 	if (!snd) {

src/Draw.c

@@ -275,12 +275,12 @@ int Draw_Init(int width, int height, char *title, int pfps, int fps) {
 
 	glBindBuffer(GL_ARRAY_BUFFER, vertexObject);
 
-	glVertexAttribPointer(vertPosLoc, 2, GL_FLOAT, GL_FALSE, Vertex2D_Length * sizeof(float),
+	glVertexAttribPointer(
-						  (void *)(0 * sizeof(float)));
+		vertPosLoc, 2, GL_FLOAT, GL_FALSE, Vertex2D_Length * sizeof(float), (void *)(0 * sizeof(float)));
-	glVertexAttribPointer(vertTexLoc, 2, GL_FLOAT, GL_FALSE, Vertex2D_Length * sizeof(float),
+	glVertexAttribPointer(
-						  (void *)(2 * sizeof(float)));
+		vertTexLoc, 2, GL_FLOAT, GL_FALSE, Vertex2D_Length * sizeof(float), (void *)(2 * sizeof(float)));
-	glVertexAttribPointer(vertColorLoc, 4, GL_FLOAT, GL_FALSE, Vertex2D_Length * sizeof(float),
+	glVertexAttribPointer(
-						  (void *)(4 * sizeof(float)));
+		vertColorLoc, 4, GL_FLOAT, GL_FALSE, Vertex2D_Length * sizeof(float), (void *)(4 * sizeof(float)));
 
 	glEnableVertexAttribArray(vertPosLoc);
 	glEnableVertexAttribArray(vertTexLoc);
@@ -342,8 +342,23 @@ void Draw_ShowInfo() {
 // Sets the render matrix
 void Draw_SetMatrix(float matrix[16]) {
 #if USE_OpenGL
-	float tempMatrix[16] = {matrix[0], matrix[4], matrix[8],  matrix[12], matrix[1], matrix[5], matrix[9],	matrix[13],
+	float tempMatrix[16] = {
-							matrix[2], matrix[6], matrix[10], matrix[14], matrix[3], matrix[7], matrix[11], matrix[15]};
+		matrix[0],
+		matrix[4],
+		matrix[8],
+		matrix[12],
+		matrix[1],
+		matrix[5],
+		matrix[9],
+		matrix[13],
+		matrix[2],
+		matrix[6],
+		matrix[10],
+		matrix[14],
+		matrix[3],
+		matrix[7],
+		matrix[11],
+		matrix[15]};
 	glLoadMatrixf(tempMatrix);
 #endif
 #if USE_OpenGLES
@@ -879,8 +894,8 @@ void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i, float scale[
 // Draw_ImgParallax
 //
 //
-void Draw_ImgParallax(DrawImg img, int imgSize[2], int imgOffset[2], float parallaxFactor[2], int gamePos[2],
+void Draw_ImgParallax(
-					  int gameSize[2]) {
+	DrawImg img, int imgSize[2], int imgOffset[2], float parallaxFactor[2], int gamePos[2], int gameSize[2]) {
 	int paralaxPos[2];
 	int mult[2];
 	int x, y;

src/Draw.h

@@ -19,8 +19,7 @@ void Draw_Clean(unsigned char r, unsigned char g, unsigned char b);
 // Draw_Loop
 //
 // Loops updating the game window.
-void Draw_Loop(void (*proc)(void *data), void (*draw)(void *data, float f),
+void Draw_Loop(void (*proc)(void *data), void (*draw)(void *data, float f), void *data);
-			   void *data);
 
 /////////////////////////////
 // Draw_BreakLoop
@@ -95,22 +94,20 @@ void Draw_DrawImgResized(DrawImg img, int x, int y, float w, float h);
 // Draw_DrawImgPart
 //
 // Draws an image part.
-void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j,
+void Draw_DrawImgPart(DrawImg img, int x, int y, int w, int h, int i, int j, float scale[2]);
-					  float scale[2]);
 
 /////////////////////////////
 // Draw_DrawImgPartHoriz
 //
 // Draws an image part horizontally.
-void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i,
+void Draw_DrawImgPartHoriz(DrawImg img, int x, int y, int w, int i, float scale[2]);
-						   float scale[2]);
 
 /////////////////////////////
 // Draw_ImgParallax
 //
 //
-void Draw_ImgParallax(DrawImg img, int imgSize[2], int imgOffset[2],
+void Draw_ImgParallax(
-					  float parallaxFactor[2], int gamePos[2], int gameSize[2]);
+	DrawImg img, int imgSize[2], int imgOffset[2], float parallaxFactor[2], int gamePos[2], int gameSize[2]);
 
 /////////////////////////////
 // Draw_SetColor
@@ -128,8 +125,7 @@ typedef void *DrawFnt;
 // Draw_DefaultFont
 //
 // Creates the default font.
-DrawFnt Draw_DefaultFont(unsigned char r, unsigned char g, unsigned char b,
+DrawFnt Draw_DefaultFont(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-						 unsigned char a);
 
 /////////////////////////////
 // Draw_LoadFont
@@ -152,15 +148,13 @@ void Draw_DrawText(DrawFnt f, char *text, int x, int y);
 // Draw_SaveRGBAToBMP
 //
 //
-void Draw_SaveRGBAToBMP(char *filename, unsigned char *data, int width,
+void Draw_SaveRGBAToBMP(char *filename, unsigned char *data, int width, int height);
-						int height);
 
 /////////////////////////////
 // Draw_SaveRGBAToPNG
 //
 //
-void Draw_SaveRGBAToPNG(char *filename, unsigned char *data, int width,
+void Draw_SaveRGBAToPNG(char *filename, unsigned char *data, int width, int height);
-						int height);
 
 /////////////////////////////
 // Draw_SaveScreenshoot

src/Entity.c

@@ -69,8 +69,7 @@ Entity Entity_New() {
 	e->color[0] = e->color[1] = e->color[2] = e->color[3] = 1.0f;
 
 	e->light[0] = e->light[1] = e->light[2] = e->light[3] = 1.0f;
-	e->defaultColor[0] = e->defaultColor[1] = e->defaultColor[2] =
+	e->defaultColor[0] = e->defaultColor[1] = e->defaultColor[2] = e->defaultColor[3] = 1.0f;
-		e->defaultColor[3] = 1.0f;
 
 	e->scale0[0] = 1.0f;
 	e->scale0[1] = 1.0f;
@@ -225,8 +224,7 @@ void Entity_CalcBBox(Entity e) {
 //
 //
 int Entity_BBoxIntersect(Entity ent1, Entity ent2) {
-	if (ent1->maxX >= ent2->minX && ent1->minX <= ent2->maxX &&
+	if (ent1->maxX >= ent2->minX && ent1->minX <= ent2->maxX && ent1->maxY >= ent2->minY && ent1->minY <= ent2->maxY) {
-		ent1->maxY >= ent2->minY && ent1->minY <= ent2->maxY) {
 		return (1);
 	}
 	return (0);
@@ -240,7 +238,8 @@ void Entity_Draw(Entity e, int x, int y, float f) {
 	vec2 fPos;
 	float scale[2];
 	if (e->internalFlags & EntityIntFlag_UpdatedColor) {
-		Draw_SetColor(e->color0[0] - f * (e->color0[0] - e->color[0]),
+		Draw_SetColor(
+			e->color0[0] - f * (e->color0[0] - e->color[0]),
 			e->color0[1] - f * (e->color0[1] - e->color[1]),
 			e->color0[2] - f * (e->color0[2] - e->color[2]),
 			e->color0[3] - f * (e->color0[3] - e->color[3]));
@@ -278,8 +277,7 @@ int Entity_IsVisible(Entity e, int x, int y, int w, int h) {
 	ymin = y - ih;
 	ymax = y + h + ih;
 
-	if (e->pos[0] < xmin || e->pos[0] > xmax || e->pos[1] < ymin ||
+	if (e->pos[0] < xmin || e->pos[0] > xmax || e->pos[1] < ymin || e->pos[1] > ymax) {
-		e->pos[1] > ymax) {
 		return (0);
 	}
 	return (1);
@@ -336,9 +334,7 @@ void Entity_PostProcess(Entity e, int ft) {
 			vec2_set(e->vel, 0, 0);
 		} else {
 			// Apply dynamic friction
-			vec2_scale(e->vel, e->vel,
+			vec2_scale(e->vel, e->vel, 1.0f - (e->backFric_dynamic + (e->backFric_static / len)));
-					   1.0f -
-						   (e->backFric_dynamic + (e->backFric_static / len)));
 		}
 
 		// Mark the update of the position.
@@ -362,8 +358,7 @@ void Entity_PostProcess(Entity e, int ft) {
 //
 //
 CollisionInfo _free_collInfo = NULL;
-CollisionInfo CollisionInfo_New(int responseType, Entity ent1, Entity ent2,
+CollisionInfo CollisionInfo_New(int responseType, Entity ent1, Entity ent2, float t, vec2 n, int applyFriction) {
-								float t, vec2 n, int applyFriction) {
 	CollisionInfo collInfo;
 
 	if (!_free_collInfo) {
@@ -408,16 +403,14 @@ void CollisionInfo_Destroy(CollisionInfo *collInfoRef) {
 // CollisionInfo_Add
 //
 //
-void CollisionInfo_Add(CollisionInfo *collInfoRef, int responseType,
+void CollisionInfo_Add(
-					   Entity ent1, Entity ent2, float t, vec2 n,
+	CollisionInfo *collInfoRef, int responseType, Entity ent1, Entity ent2, float t, vec2 n, int applyFriction) {
-					   int applyFriction) {
 	if (collInfoRef == NULL) {
 		return;
 	}
 	CollisionInfo prevCollInfo = NULL;
 	CollisionInfo collInfo     = collInfoRef[0];
-	CollisionInfo newCollInfo =
+	CollisionInfo newCollInfo  = CollisionInfo_New(responseType, ent1, ent2, t, n, applyFriction);
-		CollisionInfo_New(responseType, ent1, ent2, t, n, applyFriction);
 
 	while (collInfo != NULL && collInfo->t < t) {
 		prevCollInfo = collInfo;
@@ -435,11 +428,9 @@ void CollisionInfo_Add(CollisionInfo *collInfoRef, int responseType,
 // CollisionInfo_CheckRepetition
 //
 //
-int CollisionInfo_CheckRepetition(CollisionInfo collInfo, Entity ent1,
+int CollisionInfo_CheckRepetition(CollisionInfo collInfo, Entity ent1, Entity ent2) {
-								  Entity ent2) {
 	while (collInfo != NULL) {
-		if ((collInfo->ent1 == ent1 && collInfo->ent2 == ent2) ||
+		if ((collInfo->ent1 == ent1 && collInfo->ent2 == ent2) || (collInfo->ent1 == ent2 && collInfo->ent2 == ent1)) {
-			(collInfo->ent1 == ent2 && collInfo->ent2 == ent1)) {
 			return (1);
 		}
 		collInfo = collInfo->next;
@@ -451,8 +442,7 @@ int CollisionInfo_CheckRepetition(CollisionInfo collInfo, Entity ent1,
 // Entity_CheckCollisions
 //
 //
-int Entity_CheckCollision(Entity ent1, Entity ent2,
+int Entity_CheckCollision(Entity ent1, Entity ent2, CollisionInfo *collInfoRef) {
-						  CollisionInfo *collInfoRef) {
 	float t;
 	vec2 n;
 	vec2 vel;
@@ -483,11 +473,9 @@ int Entity_CheckCollision(Entity ent1, Entity ent2,
 
 		if (flags & EntityFlag_BlockTop) {
 			vec2_set(auxN, 0, -1);
-			vec2_scaleadd(p, ent_block->pos, auxN,
+			vec2_scaleadd(p, ent_block->pos, auxN, (ent->height + ent_block->height) / 2);
-						  (ent->height + ent_block->height) / 2);
 			block_len = ent_block->width + ent->width;
-			if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len,
+			if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len, &auxT)) {
-								  &auxT)) {
 				if (auxT < t) {
 					vec2_copy(n, auxN);
 					t             = auxT;
@@ -498,11 +486,9 @@ int Entity_CheckCollision(Entity ent1, Entity ent2,
 
 		if (flags & EntityFlag_BlockBottom) {
 			vec2_set(auxN, 0, 1);
-			vec2_scaleadd(p, ent_block->pos, auxN,
+			vec2_scaleadd(p, ent_block->pos, auxN, (ent->height + ent_block->height) / 2);
-						  (ent->height + ent_block->height) / 2);
 			block_len = ent_block->width + ent->width;
-			if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len,
+			if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len, &auxT)) {
-								  &auxT)) {
 				if (auxT < t) {
 					vec2_copy(n, auxN);
 					t             = auxT;
@@ -513,11 +499,9 @@ int Entity_CheckCollision(Entity ent1, Entity ent2,
 
 		if (flags & EntityFlag_BlockRight) {
 			vec2_set(auxN, 1, 0);
-			vec2_scaleadd(p, ent_block->pos, auxN,
+			vec2_scaleadd(p, ent_block->pos, auxN, (ent->width + ent_block->width) / 2);
-						  (ent->width + ent_block->width) / 2);
 			block_len = ent_block->height + ent->height;
-			if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len,
+			if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len, &auxT)) {
-								  &auxT)) {
 				if (auxT < t) {
 					vec2_copy(n, auxN);
 					t             = auxT;
@@ -528,11 +512,9 @@ int Entity_CheckCollision(Entity ent1, Entity ent2,
 
 		if (flags & EntityFlag_BlockLeft) {
 			vec2_set(auxN, -1, 0);
-			vec2_scaleadd(p, ent_block->pos, auxN,
+			vec2_scaleadd(p, ent_block->pos, auxN, (ent->width + ent_block->width) / 2);
-						  (ent->width + ent_block->width) / 2);
 			block_len = ent_block->height + ent->height;
-			if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len,
+			if (Intersect_RayEdge(ent->pos, ent->vel, auxN, p, block_len, &auxT)) {
-								  &auxT)) {
 				if (auxT < t) {
 					vec2_copy(n, auxN);
 					t             = auxT;
@@ -542,8 +524,7 @@ int Entity_CheckCollision(Entity ent1, Entity ent2,
 		}
 
 		if (t < 1.0f) {
-			CollisionInfo_Add(collInfoRef, CollisionResponse_Line, ent,
+			CollisionInfo_Add(collInfoRef, CollisionResponse_Line, ent, ent_block, t, n, applyFriction);
-							  ent_block, t, n, applyFriction);
 			return (1);
 		}
 
@@ -552,10 +533,8 @@ int Entity_CheckCollision(Entity ent1, Entity ent2,
 
 	// Circle-Circle test from ent1
 	vec2_minus(vel, ent1->vel, ent2->vel);
-	if (Colision_CircleCircle(ent1->pos, ent1->radius, vel, ent2->pos,
+	if (Colision_CircleCircle(ent1->pos, ent1->radius, vel, ent2->pos, ent2->radius, &t, n)) {
-							  ent2->radius, &t, n)) {
+		CollisionInfo_Add(collInfoRef, CollisionResponse_Circle, ent1, ent2, t, n, 0);
-		CollisionInfo_Add(collInfoRef, CollisionResponse_Circle, ent1, ent2, t,
-						  n, 0);
 		return (1);
 	}
 	return (0);
@@ -572,12 +551,10 @@ void Entity_CollisionResponseCircle(Entity b1, Entity b2, float t, vec2 n) {
 
 	if (b1->mass > 0.0f && b2->mass > 0.0f) {
 		// Calculate elasticity
-		elast = (b1->mass * b1->elast + b2->mass * b2->elast) /
+		elast = (b1->mass * b1->elast + b2->mass * b2->elast) / (b1->mass + b2->mass);
-				(b1->mass + b2->mass);
 
 		// Collision between two massed balls
-		moment = ((1.0f + elast) * b1->mass * b2->mass *
+		moment = ((1.0f + elast) * b1->mass * b2->mass * (fabs(vec2_dot(b1->vel, n)) + fabs(vec2_dot(b2->vel, n)))) /
-				  (fabs(vec2_dot(b1->vel, n)) + fabs(vec2_dot(b2->vel, n)))) /
 		         (b1->mass + b2->mass);
 		vec2_scale(temp, n, moment / b1->mass);
 		vec2_minus(b1->vel, b1->vel, temp);
@@ -612,8 +589,7 @@ void Entity_CollisionResponseCircle(Entity b1, Entity b2, float t, vec2 n) {
 // Entity_CollisionResponseLine
 //
 // Normal response to a collision with a line.
-void Entity_CollisionResponseLine(Entity ent, Entity ent2, float t, vec2 norm,
+void Entity_CollisionResponseLine(Entity ent, Entity ent2, float t, vec2 norm, int applyFriction) {
-								  int applyFriction) {
 	vec2 pos2, vel2, velFric, intersection;
 	float dist, fric_static, fric_dynamic, fricLen;
 
@@ -640,8 +616,7 @@ void Entity_CollisionResponseLine(Entity ent, Entity ent2, float t, vec2 norm,
 		} else {
 			// Apply dynamic friction
 			if (fricLen > 0.0f) {
-				vec2_scaleadd(pos2, intersection, velFric,
+				vec2_scaleadd(pos2, intersection, velFric, 1.0f - (fric_dynamic + (fric_static / fricLen)));
-							  1.0f - (fric_dynamic + (fric_static / fricLen)));
 			} else {
 				vec2_scaleadd(pos2, intersection, velFric, 1.0f - fric_dynamic);
 			}
@@ -671,16 +646,14 @@ int Entity_CollisionInfoResponse(CollisionInfo collInfo) {
 
 		// Check the collision methods
 		if (collInfo->ent1->collision) {
-			rc = collInfo->ent1->collision(collInfo->ent1, collInfo->ent2,
+			rc = collInfo->ent1->collision(collInfo->ent1, collInfo->ent2, collInfo->t, n1);
-										   collInfo->t, n1);
 			if (rc == 0)
 				response = 0;
 			if (rc > 1)
 				response = 2;
 		}
 		if (collInfo->ent2->collision) {
-			rc = collInfo->ent2->collision(collInfo->ent2, collInfo->ent1,
+			rc = collInfo->ent2->collision(collInfo->ent2, collInfo->ent1, collInfo->t, n2);
-										   collInfo->t, n2);
 			if (rc == 0)
 				response = 0;
 			if (rc > 1)
@@ -690,17 +663,14 @@ int Entity_CollisionInfoResponse(CollisionInfo collInfo) {
 		// Collision response
 		if (response == 1) {
 			if (collInfo->responseType == CollisionResponse_Line) {
-				Entity_CollisionResponseLine(collInfo->ent1, collInfo->ent2,
+				Entity_CollisionResponseLine(
-											 collInfo->t, collInfo->n,
+					collInfo->ent1, collInfo->ent2, collInfo->t, collInfo->n, collInfo->applyFriction);
-											 collInfo->applyFriction);
 			} else if (collInfo->responseType == CollisionResponse_Circle) {
 				if (vec2_dot(collInfo->ent1->vel, collInfo->ent1->vel) >
 				    vec2_dot(collInfo->ent2->vel, collInfo->ent2->vel)) {
-					Entity_CollisionResponseCircle(
+					Entity_CollisionResponseCircle(collInfo->ent1, collInfo->ent2, collInfo->t, n2);
-						collInfo->ent1, collInfo->ent2, collInfo->t, n2);
 				} else {
-					Entity_CollisionResponseCircle(
+					Entity_CollisionResponseCircle(collInfo->ent2, collInfo->ent1, collInfo->t, n1);
-						collInfo->ent2, collInfo->ent1, collInfo->t, n1);
 				}
 			}
 			return (1);
@@ -970,8 +940,7 @@ void Entity_Iluminate(Entity e, Entity *elist, int n) {
 	float qrad;
 
 	if (e->flags & EntityFlag_Light) {
-		Entity_SetColor(e, e->defaultColor[0], e->defaultColor[1],
+		Entity_SetColor(e, e->defaultColor[0], e->defaultColor[1], e->defaultColor[2], e->defaultColor[3]);
-						e->defaultColor[2], e->defaultColor[3]);
 		return;
 	}
 
@@ -990,13 +959,11 @@ void Entity_Iluminate(Entity e, Entity *elist, int n) {
 		qrad  = elist[i]->light[3] * elist[i]->light[3];
 		if (qdist < qrad) {
 			f = 1.0f - qdist / qrad;
-			Entity_AddColor(e, f * elist[i]->light[0], f * elist[i]->light[1],
+			Entity_AddColor(e, f * elist[i]->light[0], f * elist[i]->light[1], f * elist[i]->light[2], 0.0f);
-							f * elist[i]->light[2], 0.0f);
 		}
 	}
 
-	Entity_MultColor(e, e->defaultColor[0], e->defaultColor[1],
+	Entity_MultColor(e, e->defaultColor[0], e->defaultColor[1], e->defaultColor[2], e->defaultColor[3]);
-					 e->defaultColor[2], e->defaultColor[3]);
 	e->internalFlags &= ~EntityIntFlag_UpdateLight;
 
 	if (e->internalFlags & EntityIntFlag_UpdateColor) {
@@ -1032,9 +999,8 @@ void Entity_MarkUpdateLight(Entity e, Entity *elist, int n) {
 			max[1] = e->pos0[1] + e->light[3];
 		}
 		for (i = 0; i < n; i++) {
-			if (elist[i] != NULL && min[0] <= elist[i]->pos0[0] &&
+			if (elist[i] != NULL && min[0] <= elist[i]->pos0[0] && max[0] >= elist[i]->pos0[0] &&
-				max[0] >= elist[i]->pos0[0] && min[1] <= elist[i]->pos0[1] &&
+			    min[1] <= elist[i]->pos0[1] && max[1] >= elist[i]->pos0[1]) {
-				max[1] >= elist[i]->pos0[1]) {
 				elist[i]->internalFlags |= EntityIntFlag_UpdateLight;
 			}
 		}
@@ -1051,13 +1017,9 @@ int Entity_IsLight(Entity e) { return (e->flags & EntityFlag_Light); }
 /////////////////////////////
 // Entity_IsUpdateLight
 //
-int Entity_IsUpdateLight(Entity e) {
+int Entity_IsUpdateLight(Entity e) { return (e->internalFlags & EntityIntFlag_UpdateLight); }
-	return (e->internalFlags & EntityIntFlag_UpdateLight);
-}
 
 /////////////////////////////
 // Entity_IsMoving
 //
-int Entity_IsMoving(Entity e) {
+int Entity_IsMoving(Entity e) { return (e->internalFlags & EntityIntFlag_UpdatedPos); }
-	return (e->internalFlags & EntityIntFlag_UpdatedPos);
-}

src/Entity.h

@@ -153,8 +153,7 @@ struct TCollisionInfo {
 // CollisionInfo_New
 //
 //
-CollisionInfo CollisionInfo_New(int responseType, Entity ent1, Entity ent2,
+CollisionInfo CollisionInfo_New(int responseType, Entity ent1, Entity ent2, float t, vec2 n, int applyFriction);
-								float t, vec2 n, int applyFriction);
 
 /////////////////////////////
 // CollisionInfo_Destroy
@@ -166,15 +165,14 @@ void CollisionInfo_Destroy(CollisionInfo *collInfoRef);
 // CollisionInfo_Add
 //
 //
-void CollisionInfo_Add(CollisionInfo *collInfo, int responseType, Entity ent1,
+void CollisionInfo_Add(
-					   Entity ent2, float t, vec2 n, int applyFriction);
+	CollisionInfo *collInfo, int responseType, Entity ent1, Entity ent2, float t, vec2 n, int applyFriction);
 
 /////////////////////////////
 // CollisionInfo_CheckRepetition
 //
 //
-int CollisionInfo_CheckRepetition(CollisionInfo collInfo, Entity ent1,
+int CollisionInfo_CheckRepetition(CollisionInfo collInfo, Entity ent1, Entity ent2);
-								  Entity ent2);
 
 /////////////////////////////
 // Entity_CheckCollision
@@ -192,8 +190,7 @@ void Entity_CollisionResponseCircle(Entity b1, Entity b2, float t, vec2 n);
 // Entity_CollisionResponseLine
 //
 // Normal response to a collision with a line.
-void Entity_CollisionResponseLine(Entity ent, Entity ent2, float t, vec2 n,
+void Entity_CollisionResponseLine(Entity ent, Entity ent2, float t, vec2 n, int applyFriction);
-								  int applyFriction);
 
 /////////////////////////////
 // Entity_CollisionInfoResponse

src/GameLib.c

@@ -229,17 +229,15 @@ void GameLib_ProcLoop(void *data) {
 		repeat                 = 0;
 		CollisionInfo collInfo = NULL;
 		for (i = 0; i < _n_entities; i++) {
-			if (!(_entity[i]->flags & EntityFlag_Collision) ||
+			if (!(_entity[i]->flags & EntityFlag_Collision) || _entity[i]->mass < 0.0f)
-				_entity[i]->mass < 0.0f)
 				continue;
-			if (_entity[i]->vel[0] <= 0.0f && _entity[i]->vel[0] >= -0.0f &&
+			if (_entity[i]->vel[0] <= 0.0f && _entity[i]->vel[0] >= -0.0f && _entity[i]->vel[1] <= 0.0f &&
-				_entity[i]->vel[1] <= 0.0f && _entity[i]->vel[1] >= -0.0f) {
+			    _entity[i]->vel[1] >= -0.0f) {
 				continue;
 			}
 			for (j = 0; j < _n_entities; j++) {
 				if (i == j || !(_entity[j]->flags & EntityFlag_Collision) ||
-					CollisionInfo_CheckRepetition(collInfo, _entity[i],
+				    CollisionInfo_CheckRepetition(collInfo, _entity[i], _entity[j]) ||
-												  _entity[j]) ||
 				    !Entity_BBoxIntersect(_entity[i], _entity[j])) {
 					continue;
 				}
@@ -256,8 +254,7 @@ void GameLib_ProcLoop(void *data) {
 	// Stop remaining collisions
 	if (count == 10) {
 		for (i = 0; i < _n_entities; i++) {
-			if (!(_entity[i]->flags & EntityFlag_Collision) ||
+			if (!(_entity[i]->flags & EntityFlag_Collision) || _entity[i]->mass < 0.0f)
-				_entity[i]->mass < 0.0f)
 				continue;
 			for (j = 0; j < _n_entities; j++) {
 				if (i == j || !(_entity[j]->flags & EntityFlag_Collision) ||
@@ -281,8 +278,7 @@ void GameLib_ProcLoop(void *data) {
 	time           = Time_GetTime();
 	_entities_lock = 1;
 	for (i = 0; i < _n_entities; i++) {
-		if (!(_entity[i]->flags & EntityFlag_Overlap) ||
+		if (!(_entity[i]->flags & EntityFlag_Overlap) || _entity[i]->mass < 0.0f)
-			_entity[i]->mass < 0.0f)
 			continue;
 		for (j = 0; j < _n_entities; j++) {
 			if (!(_entity[j]->flags & EntityFlag_Overlap) || i == j)
@@ -376,9 +372,12 @@ void GameLib_DrawLoop(void *data, float f) {
 	// Draw parallax backgrounds
 	for (i = 0; i < _nParallaxBackgrounds; i++) {
 		Draw_ImgParallax(
-			_parallaxBackground[i].img, _parallaxBackground[i].imgSize,
+			_parallaxBackground[i].img,
+			_parallaxBackground[i].imgSize,
 			_parallaxBackground[i].imgOffset,
-			_parallaxBackground[i].parallaxFactor, game_pos, _game_size);
+			_parallaxBackground[i].parallaxFactor,
+			game_pos,
+			_game_size);
 	}
 
 	// Draw entities
@@ -387,8 +386,7 @@ void GameLib_DrawLoop(void *data, float f) {
 		Entity e = _entity[i];
 
 		// Check visivility
-		if (!Entity_IsVisible(e, game_pos[0], game_pos[1], _game_size[0],
+		if (!Entity_IsVisible(e, game_pos[0], game_pos[1], _game_size[0], _game_size[1])) {
-							  _game_size[1])) {
 			continue;
 		}
 
@@ -425,8 +423,7 @@ void GameLib_DrawLoop(void *data, float f) {
 	}
 #endif // EMSCRIPTEN
 
-	if (Input_GetKey(InputKey_DumpProfiling) == InputKey_Pressed &&
+	if (Input_GetKey(InputKey_DumpProfiling) == InputKey_Pressed && fproc_count > 0 && fdraw_count > 0) {
-		fproc_count > 0 && fdraw_count > 0) {
 		Print("Profiling:::::::::\n");
 		Print("t_proc.....:%6lldus\n", t_proc / fproc_count);
 		Print("t_col......:%6lldus\n", t_col / fproc_count);
@@ -448,8 +445,7 @@ void GameLib_DrawLoop(void *data, float f) {
 // GameLib_Loop
 //
 // Loops the game.
-void GameLib_Loop(void (*gameproc)(), void (*gamepostproc)(),
+void GameLib_Loop(void (*gameproc)(), void (*gamepostproc)(), void (*gamepredraw)(float f), void (*gamedraw)(float f)) {
-				  void (*gamepredraw)(float f), void (*gamedraw)(float f)) {
 	_gameproc     = gameproc;
 	_gamepostproc = gamepostproc;
 	_gamepredraw  = gamepredraw;
@@ -492,10 +488,8 @@ void GameLib_GetSize(int size[2]) {
 	size[1] = _game_size[1];
 }
 void GameLib_GetPosInstant(int pos[2], float f) {
-	pos[0] = _game_pos0[0] +
+	pos[0] = _game_pos0[0] + f * ((_game_pos1[0] + _game_posOffset[0]) - _game_pos0[0]);
-			 f * ((_game_pos1[0] + _game_posOffset[0]) - _game_pos0[0]);
+	pos[1] = _game_pos0[1] + f * ((_game_pos1[1] + _game_posOffset[1]) - _game_pos0[1]);
-	pos[1] = _game_pos0[1] +
-			 f * ((_game_pos1[1] + _game_posOffset[1]) - _game_pos0[1]);
 }
 void GameLib_SetPosOffset(int posOffset[2]) {
 	_game_posOffset[0] = posOffset[0];
@@ -513,12 +507,10 @@ void GameLib_MoveToPos(vec2 pos, float f) {
 	GameLib_MoveToPosV(pos, f);
 }
 void GameLib_MoveToPosH(vec2 pos, float f) {
-	_game_pos1[0] =
+	_game_pos1[0] = _game_pos1[0] + (pos[0] - (_game_pos1[0] + (_game_size[0] / 2.0f))) * f;
-		_game_pos1[0] + (pos[0] - (_game_pos1[0] + (_game_size[0] / 2.0f))) * f;
 }
 void GameLib_MoveToPosV(vec2 pos, float f) {
-	_game_pos1[1] =
+	_game_pos1[1] = _game_pos1[1] + (pos[1] - (_game_pos1[1] + (_game_size[1] / 2.0f))) * f;
-		_game_pos1[1] + (pos[1] - (_game_pos1[1] + (_game_size[1] / 2.0f))) * f;
 }
 
 /////////////////////////////
@@ -584,8 +576,7 @@ int GameLib_EntityCustomCheckCollision(Entity ent, vec2 vel) {
 	Entity_CalcBBox(ent);
 
 	for (j = 0; j < _n_entities; j++) {
-		if (!(_entity[j]->flags & EntityFlag_Collision) ||
+		if (!(_entity[j]->flags & EntityFlag_Collision) || !Entity_BBoxIntersect(ent, _entity[j])) {
-			!Entity_BBoxIntersect(ent, _entity[j])) {
 			continue;
 		}
 		Entity_CheckCollision(ent, _entity[j], &collInfo);
@@ -669,14 +660,11 @@ void GameLib_EntitySetLight(Entity e, float r, float g, float b, float rad) {
 // GameLib_ConvertScreenPositionToGamePosition
 //
 //
-void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos,
+void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos, float f) {
-												 float f) {
 	int game_pos[2];
 
-	game_pos[0] = _game_pos0[0] +
+	game_pos[0] = _game_pos0[0] + f * ((_game_pos1[0] + _game_posOffset[0]) - _game_pos0[0]);
-				  f * ((_game_pos1[0] + _game_posOffset[0]) - _game_pos0[0]);
+	game_pos[1] = _game_pos0[1] + f * ((_game_pos1[1] + _game_posOffset[1]) - _game_pos0[1]);
-	game_pos[1] = _game_pos0[1] +
-				  f * ((_game_pos1[1] + _game_posOffset[1]) - _game_pos0[1]);
 
 	gamePos[0] = (screenPos[0] * _game_size[0]) + game_pos[0];
 	gamePos[1] = (screenPos[1] * _game_size[1]) + game_pos[1];
@@ -686,8 +674,7 @@ void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos,
 // GameLib_AddParallaxBackground
 //
 //
-void GameLib_AddParallaxBackground(DrawImg img, int imgSize[2],
+void GameLib_AddParallaxBackground(DrawImg img, int imgSize[2], int imgOffset[2], float parallaxFactor[2]) {
-								   int imgOffset[2], float parallaxFactor[2]) {
 	int idx = _nParallaxBackgrounds;
 	if ((idx + 1) >= MaxParallaxBackgrounds) {
 		Print("GameLib: Can't add parallaxBackground, limit reached.");

src/GameLib.h

@@ -39,8 +39,7 @@ int GameLib_DelEntity(Entity e);
 // GameLib_Loop
 //
 // Loops the game.
-void GameLib_Loop(void (*gameproc)(), void (*gamepostproc)(),
+void GameLib_Loop(void (*gameproc)(), void (*gamepostproc)(), void (*gamepredraw)(float f), void (*gamedraw)(float f));
-				  void (*gamepredraw)(float f), void (*gamedraw)(float f));
 
 /////////////////////////////
 // GameLib_GetPos
@@ -114,15 +113,13 @@ void GameLib_EntitySetLight(Entity e, float r, float g, float b, float rad);
 // GameLib_ConvertScreenPositionToGamePosition
 //
 //
-void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos,
+void GameLib_ConvertScreenPositionToGamePosition(vec2 screenPos, vec2 gamePos, float f);
-												 float f);
 
 /////////////////////////////
 // GameLib_AddParallaxBackground
 //
 //
-void GameLib_AddParallaxBackground(DrawImg img, int imgSize[2],
+void GameLib_AddParallaxBackground(DrawImg img, int imgSize[2], int imgOffset[2], float parallaxFactor[2]);
-								   int imgOffset[2], float parallaxFactor[2]);
 
 /////////////////////////////
 // GameLib_CleanParallaxBackgrounds

src/Input.c

@@ -53,7 +53,8 @@ void Input_Frame() {
 	Input_SetKey(InputKey_Left, keys[SDL_SCANCODE_LEFT] | keys[SDL_SCANCODE_A]);
 	Input_SetKey(InputKey_Right, keys[SDL_SCANCODE_RIGHT] | keys[SDL_SCANCODE_D]);
 	Input_SetKey(InputKey_Jump, keys[SDL_SCANCODE_SPACE]);
-	Input_SetKey(InputKey_Continue,
+	Input_SetKey(
+		InputKey_Continue,
 		keys[SDL_SCANCODE_RETURN] | keys[SDL_SCANCODE_RETURN2] | keys[SDL_SCANCODE_KP_ENTER] | _pointerDown);
 
 	Input_SetKey(InputKey_DumpProfiling, keys[SDL_SCANCODE_M]);

src/Input.h

@@ -54,11 +54,7 @@ void Input_SetKey(InputKey key, int status);
 // InputKeyStatus //
 ///////////////////
 // Key status enumeration.
-typedef enum {
+typedef enum { InputKey_Released, InputKey_Pressed, InputKey_Holded } InputKeyStatus;
-	InputKey_Released,
-	InputKey_Pressed,
-	InputKey_Holded
-} InputKeyStatus;
 
 /////////////////////////////
 // Input_GetKey

src/QuadArray2D.c

@@ -35,22 +35,19 @@ void QuadArray2D_AddVertex(QuadArray2D quadArray, float v[]) {
 	if (quadArray->resVertex <= quadArray->nVertex) {
 		// Grow vertexData
 		quadArray->resVertex *= 2;
-		float *newVertexData =
+		float *newVertexData = malloc(sizeof(float) * Vertex2D_Length * quadArray->resVertex);
-			malloc(sizeof(float) * Vertex2D_Length * quadArray->resVertex);
+		memcpy(newVertexData, quadArray->vertexData, sizeof(float) * Vertex2D_Length * quadArray->nVertex);
-		memcpy(newVertexData, quadArray->vertexData,
-			   sizeof(float) * Vertex2D_Length * quadArray->nVertex);
 		free(quadArray->vertexData);
 		quadArray->vertexData = newVertexData;
 	}
 
 	// Add the vertex
-	memcpy(quadArray->vertexData + (Vertex2D_Length * quadArray->nVertex), v,
+	memcpy(quadArray->vertexData + (Vertex2D_Length * quadArray->nVertex), v, sizeof(float) * Vertex2D_Length);
-		   sizeof(float) * Vertex2D_Length);
 	quadArray->nVertex++;
 }
 
-void QuadArray2D_AddQuad(QuadArray2D quadArray, float x0, float y0, float u0,
+void QuadArray2D_AddQuad(
-						 float v0, float x1, float y1, float u1, float v1,
+	QuadArray2D quadArray, float x0, float y0, float u0, float v0, float x1, float y1, float u1, float v1,
 	float color[]) {
 	float v[Vertex2D_Length];
 

src/QuadArray2D.h

@@ -24,8 +24,8 @@ void QuadArray2D_Clean(QuadArray2D quadArray);
 
 void QuadArray2D_AddVertex(QuadArray2D quadArray, float v[]);
 
-void QuadArray2D_AddQuad(QuadArray2D quadArray, float x0, float y0, float u0,
+void QuadArray2D_AddQuad(
-						 float v0, float x1, float y1, float u1, float v1,
+	QuadArray2D quadArray, float x0, float y0, float u0, float v0, float x1, float y1, float u1, float v1,
 	float color[]);
 
 #endif

src/Util.c

@@ -38,9 +38,7 @@ void Rect_UnionRect(Rect r0, Rect r1, Rect rd) {
 	rd->y1 = MaximumInt(r0->y1, r1->y1);
 }
 
-int Rect_PointInside(Rect r, int x, int y) {
+int Rect_PointInside(Rect r, int x, int y) { return (x >= r->x0 && x < r->x1 && y >= r->y0 && y < r->y1); }
-	return (x >= r->x0 && x < r->x1 && y >= r->y0 && y < r->y1);
-}
 
 int Rect_PointInsideAny(TRect r[], int rCount, int x, int y) {
 	int insideAny = 0;
@@ -183,8 +181,7 @@ int Intersec_RayUnitCircle(vec2 orig, vec2 vel, vec2 center, float *t) {
 // Colision_CircleCircle
 //
 // Colision point of a circle against another circle.
-int Colision_CircleCircle(vec2 cir1, float rad1, vec2 vel, vec2 cir2,
+int Colision_CircleCircle(vec2 cir1, float rad1, vec2 vel, vec2 cir2, float rad2, float *t, vec2 n) {
-						  float rad2, float *t, vec2 n) {
 	vec2 vel_a, orig_a, cen_a, temp;
 	float rads, invrads;
 	float maxx, minx;
@@ -230,8 +227,7 @@ int Colision_CircleCircle(vec2 cir1, float rad1, vec2 vel, vec2 cir2,
 // Intersect_RayEdge
 //
 // Intersection between a ray and a edge.
-int Intersect_RayEdge(vec2 pos, vec2 vel, vec2 norm, vec2 edgePos, float len,
+int Intersect_RayEdge(vec2 pos, vec2 vel, vec2 norm, vec2 edgePos, float len, float *t) {
-					  float *t) {
 	vec2 pos2, intersection, perp, edgePos2;
 	float delta, d1, d2, hLen;
 

src/Util.h

@@ -85,15 +85,13 @@ int Intersec_RayUnitCircle(vec2 orig, vec2 vel, vec2 center, float *t);
 // Intersect_CircleCircle
 //
 // Colision point of a circle against another circle.
-int Colision_CircleCircle(vec2 cir1, float ra, vec2 vel, vec2 cb, float rb,
+int Colision_CircleCircle(vec2 cir1, float ra, vec2 vel, vec2 cb, float rb, float *t, vec2 n);
-						  float *t, vec2 n);
 
 /////////////////////////////
 // Intersect_RayEdge
 //
 // Intersection between a ray and a edge.
-int Intersect_RayEdge(vec2 pos, vec2 vel, vec2 norm, vec2 edgePos, float len,
+int Intersect_RayEdge(vec2 pos, vec2 vel, vec2 norm, vec2 edgePos, float len, float *t);
-					  float *t);
 
 /////////////////////////////
 // absmod

src/lodepng.h

@@ -82,14 +82,13 @@ source files with custom allocators.*/
 #endif
 
 #ifdef LODEPNG_COMPILE_CPP
-#include <vector>
 #include <string>
+#include <vector>
 #endif /*LODEPNG_COMPILE_CPP*/
 
 #ifdef LODEPNG_COMPILE_PNG
 /*The PNG color types (also used for raw).*/
-typedef enum LodePNGColorType
+typedef enum LodePNGColorType {
-{
 	LCT_GREY       = 0, /*greyscale: 1,2,4,8,16 bit*/
 	LCT_RGB        = 2, /*RGB: 8,16 bit*/
 	LCT_PALETTE    = 3, /*palette: 1,2,4,8 bit*/
@@ -113,38 +112,32 @@ colortype: the desired color type for the raw output image. See explanation on P
 bitdepth: the desired bit depth for the raw output image. See explanation on PNG color types.
 Return value: LodePNG error code (0 means no error).
 */
-unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h,
+unsigned lodepng_decode_memory(
-                               const unsigned char* in, size_t insize,
+	unsigned char **out, unsigned *w, unsigned *h, const unsigned char *in, size_t insize, LodePNGColorType colortype,
-                               LodePNGColorType colortype, unsigned bitdepth);
+	unsigned bitdepth);
 
 /*Same as lodepng_decode_memory, but always decodes to 32-bit RGBA raw image*/
-unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h,
+unsigned lodepng_decode32(unsigned char **out, unsigned *w, unsigned *h, const unsigned char *in, size_t insize);
-                          const unsigned char* in, size_t insize);
 
 /*Same as lodepng_decode_memory, but always decodes to 24-bit RGB raw image*/
-unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h,
+unsigned lodepng_decode24(unsigned char **out, unsigned *w, unsigned *h, const unsigned char *in, size_t insize);
-                          const unsigned char* in, size_t insize);
 
 #ifdef LODEPNG_COMPILE_DISK
 /*
 Load PNG from disk, from file with given name.
 Same as the other decode functions, but instead takes a filename as input.
 */
-unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h,
+unsigned lodepng_decode_file(
-                             const char* filename,
+	unsigned char **out, unsigned *w, unsigned *h, const char *filename, LodePNGColorType colortype, unsigned bitdepth);
-                             LodePNGColorType colortype, unsigned bitdepth);
 
 /*Same as lodepng_decode_file, but always decodes to 32-bit RGBA raw image.*/
-unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h,
+unsigned lodepng_decode32_file(unsigned char **out, unsigned *w, unsigned *h, const char *filename);
-                               const char* filename);
 
 /*Same as lodepng_decode_file, but always decodes to 24-bit RGB raw image.*/
-unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h,
+unsigned lodepng_decode24_file(unsigned char **out, unsigned *w, unsigned *h, const char *filename);
-                               const char* filename);
 #endif /*LODEPNG_COMPILE_DISK*/
 #endif /*LODEPNG_COMPILE_DECODER*/
 
-
 #ifdef LODEPNG_COMPILE_ENCODER
 /*
 Converts raw pixel data into a PNG image in memory. The colortype and bitdepth
@@ -162,17 +155,15 @@ colortype: the color type of the raw input image. See explanation on PNG color t
 bitdepth: the bit depth of the raw input image. See explanation on PNG color types.
 Return value: LodePNG error code (0 means no error).
 */
-unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize,
+unsigned lodepng_encode_memory(
-                               const unsigned char* image, unsigned w, unsigned h,
+	unsigned char **out, size_t *outsize, const unsigned char *image, unsigned w, unsigned h,
 	LodePNGColorType colortype, unsigned bitdepth);
 
 /*Same as lodepng_encode_memory, but always encodes from 32-bit RGBA raw image.*/
-unsigned lodepng_encode32(unsigned char** out, size_t* outsize,
+unsigned lodepng_encode32(unsigned char **out, size_t *outsize, const unsigned char *image, unsigned w, unsigned h);
-                          const unsigned char* image, unsigned w, unsigned h);
 
 /*Same as lodepng_encode_memory, but always encodes from 24-bit RGB raw image.*/
-unsigned lodepng_encode24(unsigned char** out, size_t* outsize,
+unsigned lodepng_encode24(unsigned char **out, size_t *outsize, const unsigned char *image, unsigned w, unsigned h);
-                          const unsigned char* image, unsigned w, unsigned h);
 
 #ifdef LODEPNG_COMPILE_DISK
 /*
@@ -180,40 +171,36 @@ Converts raw pixel data into a PNG file on disk.
 Same as the other encode functions, but instead takes a filename as output.
 NOTE: This overwrites existing files without warning!
 */
-unsigned lodepng_encode_file(const char* filename,
+unsigned lodepng_encode_file(
-                             const unsigned char* image, unsigned w, unsigned h,
+	const char *filename, const unsigned char *image, unsigned w, unsigned h, LodePNGColorType colortype,
-                             LodePNGColorType colortype, unsigned bitdepth);
+	unsigned bitdepth);
 
 /*Same as lodepng_encode_file, but always encodes from 32-bit RGBA raw image.*/
-unsigned lodepng_encode32_file(const char* filename,
+unsigned lodepng_encode32_file(const char *filename, const unsigned char *image, unsigned w, unsigned h);
-                               const unsigned char* image, unsigned w, unsigned h);
 
 /*Same as lodepng_encode_file, but always encodes from 24-bit RGB raw image.*/
-unsigned lodepng_encode24_file(const char* filename,
+unsigned lodepng_encode24_file(const char *filename, const unsigned char *image, unsigned w, unsigned h);
-                               const unsigned char* image, unsigned w, unsigned h);
 #endif /*LODEPNG_COMPILE_DISK*/
 #endif /*LODEPNG_COMPILE_ENCODER*/
 
-
 #ifdef LODEPNG_COMPILE_CPP
-namespace lodepng
+namespace lodepng {
-{
 #ifdef LODEPNG_COMPILE_DECODER
 /*Same as lodepng_decode_memory, but decodes to an std::vector. The colortype
 is the format to output the pixels to. Default is RGBA 8-bit per channel.*/
-unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
+unsigned decode(
-                const unsigned char* in, size_t insize,
+	std::vector<unsigned char> &out, unsigned &w, unsigned &h, const unsigned char *in, size_t insize,
 	LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
-unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
+unsigned decode(
-                const std::vector<unsigned char>& in,
+	std::vector<unsigned char> &out, unsigned &w, unsigned &h, const std::vector<unsigned char> &in,
 	LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
 #ifdef LODEPNG_COMPILE_DISK
 /*
 Converts PNG file from disk to raw pixel data in memory.
 Same as the other decode functions, but instead takes a filename as input.
 */
-unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
+unsigned decode(
-                const std::string& filename,
+	std::vector<unsigned char> &out, unsigned &w, unsigned &h, const std::string &filename,
 	LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
 #endif /* LODEPNG_COMPILE_DISK */
 #endif /* LODEPNG_COMPILE_DECODER */
@@ -221,11 +208,11 @@ unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
 #ifdef LODEPNG_COMPILE_ENCODER
 /*Same as lodepng_encode_memory, but encodes to an std::vector. colortype
 is that of the raw input data. The output PNG color type will be auto chosen.*/
-unsigned encode(std::vector<unsigned char>& out,
+unsigned encode(
-                const unsigned char* in, unsigned w, unsigned h,
+	std::vector<unsigned char> &out, const unsigned char *in, unsigned w, unsigned h,
 	LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
-unsigned encode(std::vector<unsigned char>& out,
+unsigned encode(
-                const std::vector<unsigned char>& in, unsigned w, unsigned h,
+	std::vector<unsigned char> &out, const std::vector<unsigned char> &in, unsigned w, unsigned h,
 	LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
 #ifdef LODEPNG_COMPILE_DISK
 /*
@@ -233,11 +220,11 @@ Converts 32-bit RGBA raw pixel data into a PNG file on disk.
 Same as the other encode functions, but instead takes a filename as output.
 NOTE: This overwrites existing files without warning!
 */
-unsigned encode(const std::string& filename,
+unsigned encode(
-                const unsigned char* in, unsigned w, unsigned h,
+	const std::string &filename, const unsigned char *in, unsigned w, unsigned h, LodePNGColorType colortype = LCT_RGBA,
-                LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
+	unsigned bitdepth = 8);
-unsigned encode(const std::string& filename,
+unsigned encode(
-                const std::vector<unsigned char>& in, unsigned w, unsigned h,
+	const std::string &filename, const std::vector<unsigned char> &in, unsigned w, unsigned h,
 	LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
 #endif /* LODEPNG_COMPILE_DISK */
 #endif /* LODEPNG_COMPILE_ENCODER */
@@ -253,20 +240,17 @@ const char* lodepng_error_text(unsigned code);
 #ifdef LODEPNG_COMPILE_DECODER
 /*Settings for zlib decompression*/
 typedef struct LodePNGDecompressSettings LodePNGDecompressSettings;
-struct LodePNGDecompressSettings
+struct LodePNGDecompressSettings {
-{
 	unsigned ignore_adler32; /*if 1, continue and don't give an error message if the Adler32 checksum is corrupted*/
 
 	/*use custom zlib decoder instead of built in one (default: null)*/
-  unsigned (*custom_zlib)(unsigned char**, size_t*,
+	unsigned (*custom_zlib)(
-                          const unsigned char*, size_t,
+		unsigned char **, size_t *, const unsigned char *, size_t, const LodePNGDecompressSettings *);
-                          const LodePNGDecompressSettings*);
 	/*use custom deflate decoder instead of built in one (default: null)
 	if custom_zlib is used, custom_deflate is ignored since only the built in
 	zlib function will call custom_deflate*/
-  unsigned (*custom_inflate)(unsigned char**, size_t*,
+	unsigned (*custom_inflate)(
-                             const unsigned char*, size_t,
+		unsigned char **, size_t *, const unsigned char *, size_t, const LodePNGDecompressSettings *);
-                             const LodePNGDecompressSettings*);
 
 	const void *custom_context; /*optional custom settings for custom functions*/
 };
@@ -292,15 +276,12 @@ struct LodePNGCompressSettings /*deflate = compress*/
 	unsigned lazymatching; /*use lazy matching: better compression but a bit slower. Default: true*/
 
 	/*use custom zlib encoder instead of built in one (default: null)*/
-  unsigned (*custom_zlib)(unsigned char**, size_t*,
+	unsigned (*custom_zlib)(unsigned char **, size_t *, const unsigned char *, size_t, const LodePNGCompressSettings *);
-                          const unsigned char*, size_t,
-                          const LodePNGCompressSettings*);
 	/*use custom deflate encoder instead of built in one (default: null)
 	if custom_zlib is used, custom_deflate is ignored since only the built in
 	zlib function will call custom_deflate*/
-  unsigned (*custom_deflate)(unsigned char**, size_t*,
+	unsigned (*custom_deflate)(
-                             const unsigned char*, size_t,
+		unsigned char **, size_t *, const unsigned char *, size_t, const LodePNGCompressSettings *);
-                             const LodePNGCompressSettings*);
 
 	const void *custom_context; /*optional custom settings for custom functions*/
 };
@@ -315,8 +296,7 @@ Color mode of an image. Contains all information required to decode the pixel
 bits to RGBA colors. This information is the same as used in the PNG file
 format, and is used both for PNG and raw image data in LodePNG.
 */
-typedef struct LodePNGColorMode
+typedef struct LodePNGColorMode {
-{
 	/*header (IHDR)*/
 	LodePNGColorType colortype; /*color type, see PNG standard or documentation further in this header file*/
 	unsigned bitdepth;          /*bits per sample, see PNG standard or documentation further in this header file*/
@@ -362,8 +342,8 @@ unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode*
 
 void lodepng_palette_clear(LodePNGColorMode *info);
 /*add 1 color to the palette*/
-unsigned lodepng_palette_add(LodePNGColorMode* info,
+unsigned
-                             unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+lodepng_palette_add(LodePNGColorMode *info, unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 /*get the total amount of bits per pixel, based on colortype and bitdepth in the struct*/
 unsigned lodepng_get_bpp(const LodePNGColorMode *info);
@@ -392,8 +372,7 @@ size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* colo
 
 #ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
 /*The information of a Time chunk in PNG.*/
-typedef struct LodePNGTime
+typedef struct LodePNGTime {
-{
 	unsigned year;   /*2 bytes used (0-65535)*/
 	unsigned month;  /*1-12*/
 	unsigned day;    /*1-31*/
@@ -404,8 +383,7 @@ typedef struct LodePNGTime
 #endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
 
 /*Information about the PNG image, except pixels, width and height.*/
-typedef struct LodePNGInfo
+typedef struct LodePNGInfo {
-{
 	/*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/
 	unsigned compression_method; /*compression method of the original file. Always 0.*/
 	unsigned filter_method;      /*filter method of the original file*/
@@ -492,8 +470,9 @@ void lodepng_clear_text(LodePNGInfo* info); /*use this to clear the texts again
 unsigned lodepng_add_text(LodePNGInfo *info, const char *key, const char *str); /*push back both texts at once*/
 
 void lodepng_clear_itext(LodePNGInfo *info); /*use this to clear the itexts again after you filled them in*/
-unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag,
+unsigned lodepng_add_itext(
-                           const char* transkey, const char* str); /*push back the 4 texts of 1 chunk at once*/
+	LodePNGInfo *info, const char *key, const char *langtag, const char *transkey,
+	const char *str); /*push back the 4 texts of 1 chunk at once*/
 #endif                /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
 
 /*
@@ -507,8 +486,8 @@ For < 8 bpp images, there should not be padding bits at the end of scanlines.
 For 16-bit per channel colors, uses big endian format like PNG does.
 Return value is LodePNG error code
 */
-unsigned lodepng_convert(unsigned char* out, const unsigned char* in,
+unsigned lodepng_convert(
-                         const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in,
+	unsigned char *out, const unsigned char *in, const LodePNGColorMode *mode_out, const LodePNGColorMode *mode_in,
 	unsigned w, unsigned h);
 
 #ifdef LODEPNG_COMPILE_DECODER
@@ -516,8 +495,7 @@ unsigned lodepng_convert(unsigned char* out, const unsigned char* in,
 Settings for the decoder. This contains settings for the PNG and the Zlib
 decoder, but not the Info settings from the Info structs.
 */
-typedef struct LodePNGDecoderSettings
+typedef struct LodePNGDecoderSettings {
-{
 	LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/
 
 	unsigned ignore_crc; /*ignore CRC checksums*/
@@ -536,8 +514,7 @@ void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings);
 
 #ifdef LODEPNG_COMPILE_ENCODER
 /*automatically use color type with less bits per pixel if losslessly possible. Default: AUTO*/
-typedef enum LodePNGFilterStrategy
+typedef enum LodePNGFilterStrategy {
-{
 	/*every filter at zero*/
 	LFS_ZERO,
 	/*Use filter that gives minimum sum, as described in the official PNG filter heuristic.*/
@@ -556,8 +533,7 @@ typedef enum LodePNGFilterStrategy
 
 /*Gives characteristics about the colors of the image, which helps decide which color model to use for encoding.
 Used internally by default if "auto_convert" is enabled. Public because it's useful for custom algorithms.*/
-typedef struct LodePNGColorProfile
+typedef struct LodePNGColorProfile {
-{
 	unsigned colored;     /*not greyscale*/
 	unsigned key;         /*if true, image is not opaque. Only if true and alpha is false, color key is possible.*/
 	unsigned short key_r; /*these values are always in 16-bit bitdepth in the profile*/
@@ -566,24 +542,22 @@ typedef struct LodePNGColorProfile
 	unsigned alpha;              /*alpha channel or alpha palette required*/
 	unsigned numcolors;          /*amount of colors, up to 257. Not valid if bits == 16.*/
 	unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order*/
-  unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for greyscale only. 16 if 16-bit per channel required.*/
+	unsigned
+		bits; /*bits per channel (not for palette). 1,2 or 4 for greyscale only. 16 if 16-bit per channel required.*/
 } LodePNGColorProfile;
 
 void lodepng_color_profile_init(LodePNGColorProfile *profile);
 
 /*Get a LodePNGColorProfile of the image.*/
-unsigned lodepng_get_color_profile(LodePNGColorProfile* profile,
+unsigned lodepng_get_color_profile(
-                                   const unsigned char* image, unsigned w, unsigned h,
+	LodePNGColorProfile *profile, const unsigned char *image, unsigned w, unsigned h, const LodePNGColorMode *mode_in);
-                                   const LodePNGColorMode* mode_in);
 /*The function LodePNG uses internally to decide the PNG color with auto_convert.
 Chooses an optimal color model, e.g. grey if only grey pixels, palette if < 256 colors, ...*/
-unsigned lodepng_auto_choose_color(LodePNGColorMode* mode_out,
+unsigned lodepng_auto_choose_color(
-                                   const unsigned char* image, unsigned w, unsigned h,
+	LodePNGColorMode *mode_out, const unsigned char *image, unsigned w, unsigned h, const LodePNGColorMode *mode_in);
-                                   const LodePNGColorMode* mode_in);
 
 /*Settings for the encoder.*/
-typedef struct LodePNGEncoderSettings
+typedef struct LodePNGEncoderSettings {
-{
 	LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such as window size, ...*/
 
 	unsigned auto_convert; /*automatically choose output PNG color type. Default: true*/
@@ -616,11 +590,9 @@ typedef struct LodePNGEncoderSettings
 void lodepng_encoder_settings_init(LodePNGEncoderSettings *settings);
 #endif /*LODEPNG_COMPILE_ENCODER*/
 
-
 #if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER)
 /*The settings, state and information for extended encoding and decoding.*/
-typedef struct LodePNGState
+typedef struct LodePNGState {
-{
 #ifdef LODEPNG_COMPILE_DECODER
 	LodePNGDecoderSettings decoder; /*the decoding settings*/
 #endif                              /*LODEPNG_COMPILE_DECODER*/
@@ -647,26 +619,21 @@ void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source);
 Same as lodepng_decode_memory, but uses a LodePNGState to allow custom settings and
 getting much more information about the PNG image and color mode.
 */
-unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h,
+unsigned lodepng_decode(
-                        LodePNGState* state,
+	unsigned char **out, unsigned *w, unsigned *h, LodePNGState *state, const unsigned char *in, size_t insize);
-                        const unsigned char* in, size_t insize);
 
 /*
 Read the PNG header, but not the actual data. This returns only the information
 that is in the header chunk of the PNG, such as width, height and color type. The
 information is placed in the info_png field of the LodePNGState.
 */
-unsigned lodepng_inspect(unsigned* w, unsigned* h,
+unsigned lodepng_inspect(unsigned *w, unsigned *h, LodePNGState *state, const unsigned char *in, size_t insize);
-                         LodePNGState* state,
-                         const unsigned char* in, size_t insize);
 #endif /*LODEPNG_COMPILE_DECODER*/
 
-
 #ifdef LODEPNG_COMPILE_ENCODER
 /*This function allocates the out buffer with standard malloc and stores the size in *outsize.*/
-unsigned lodepng_encode(unsigned char** out, size_t* outsize,
+unsigned lodepng_encode(
-                        const unsigned char* image, unsigned w, unsigned h,
+	unsigned char **out, size_t *outsize, const unsigned char *image, unsigned w, unsigned h, LodePNGState *state);
-                        LodePNGState* state);
 #endif /*LODEPNG_COMPILE_ENCODER*/
 
 /*
@@ -730,15 +697,13 @@ and data separately. The type is a 4-letter string.
 The out variable and outlength are updated to reflect the new reallocated buffer.
 Returne error code (0 if it went ok)
 */
-unsigned lodepng_chunk_create(unsigned char** out, size_t* outlength, unsigned length,
+unsigned lodepng_chunk_create(
-                              const char* type, const unsigned char* data);
+	unsigned char **out, size_t *outlength, unsigned length, const char *type, const unsigned char *data);
-
 
 /*Calculate CRC32 of buffer*/
 unsigned lodepng_crc32(const unsigned char *buf, size_t len);
 #endif /*LODEPNG_COMPILE_PNG*/
 
-
 #ifdef LODEPNG_COMPILE_ZLIB
 /*
 This zlib part can be used independently to zlib compress and decompress a
@@ -748,8 +713,8 @@ part of zlib that is required for PNG, it does not support dictionaries.
 
 #ifdef LODEPNG_COMPILE_DECODER
 /*Inflate a buffer. Inflate is the decompression step of deflate. Out buffer must be freed after use.*/
-unsigned lodepng_inflate(unsigned char** out, size_t* outsize,
+unsigned lodepng_inflate(
-                         const unsigned char* in, size_t insize,
+	unsigned char **out, size_t *outsize, const unsigned char *in, size_t insize,
 	const LodePNGDecompressSettings *settings);
 
 /*
@@ -758,8 +723,8 @@ data must be according to the zlib specification.
 Either, *out must be NULL and *outsize must be 0, or, *out must be a valid
 buffer and *outsize its size in bytes. out must be freed by user after usage.
 */
-unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize,
+unsigned lodepng_zlib_decompress(
-                                 const unsigned char* in, size_t insize,
+	unsigned char **out, size_t *outsize, const unsigned char *in, size_t insize,
 	const LodePNGDecompressSettings *settings);
 #endif /*LODEPNG_COMPILE_DECODER*/
 
@@ -771,20 +736,20 @@ The data is output in the format of the zlib specification.
 Either, *out must be NULL and *outsize must be 0, or, *out must be a valid
 buffer and *outsize its size in bytes. out must be freed by user after usage.
 */
-unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize,
+unsigned lodepng_zlib_compress(
-                               const unsigned char* in, size_t insize,
+	unsigned char **out, size_t *outsize, const unsigned char *in, size_t insize,
 	const LodePNGCompressSettings *settings);
 
 /*
 Find length-limited Huffman code for given frequencies. This function is in the
 public interface only for tests, it's used internally by lodepng_deflate.
 */
-unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies,
+unsigned
-                                      size_t numcodes, unsigned maxbitlen);
+lodepng_huffman_code_lengths(unsigned *lengths, const unsigned *frequencies, size_t numcodes, unsigned maxbitlen);
 
 /*Compress a buffer with deflate. See RFC 1951. Out buffer must be freed after use.*/
-unsigned lodepng_deflate(unsigned char** out, size_t* outsize,
+unsigned lodepng_deflate(
-                         const unsigned char* in, size_t insize,
+	unsigned char **out, size_t *outsize, const unsigned char *in, size_t insize,
 	const LodePNGCompressSettings *settings);
 
 #endif /*LODEPNG_COMPILE_ENCODER*/
@@ -814,11 +779,9 @@ unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const
 
 #ifdef LODEPNG_COMPILE_CPP
 /* The LodePNG C++ wrapper uses std::vectors instead of manually allocated memory buffers. */
-namespace lodepng
+namespace lodepng {
-{
 #ifdef LODEPNG_COMPILE_PNG
-class State : public LodePNGState
+class State : public LodePNGState {
-{
   public:
 	State();
 	State(const State &other);
@@ -828,22 +791,17 @@ class State : public LodePNGState
 
 #ifdef LODEPNG_COMPILE_DECODER
 /* Same as other lodepng::decode, but using a State for more settings and information. */
-unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
+unsigned
-                State& state,
+decode(std::vector<unsigned char> &out, unsigned &w, unsigned &h, State &state, const unsigned char *in, size_t insize);
-                const unsigned char* in, size_t insize);
+unsigned
-unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
+decode(std::vector<unsigned char> &out, unsigned &w, unsigned &h, State &state, const std::vector<unsigned char> &in);
-                State& state,
-                const std::vector<unsigned char>& in);
 #endif /*LODEPNG_COMPILE_DECODER*/
 
 #ifdef LODEPNG_COMPILE_ENCODER
 /* Same as other lodepng::encode, but using a State for more settings and information. */
-unsigned encode(std::vector<unsigned char>& out,
+unsigned encode(std::vector<unsigned char> &out, const unsigned char *in, unsigned w, unsigned h, State &state);
-                const unsigned char* in, unsigned w, unsigned h,
+unsigned
-                State& state);
+encode(std::vector<unsigned char> &out, const std::vector<unsigned char> &in, unsigned w, unsigned h, State &state);
-unsigned encode(std::vector<unsigned char>& out,
-                const std::vector<unsigned char>& in, unsigned w, unsigned h,
-                State& state);
 #endif /*LODEPNG_COMPILE_ENCODER*/
 
 #ifdef LODEPNG_COMPILE_DISK
@@ -864,21 +822,25 @@ unsigned save_file(const std::vector<unsigned char>& buffer, const std::string&
 #ifdef LODEPNG_COMPILE_ZLIB
 #ifdef LODEPNG_COMPILE_DECODER
 /* Zlib-decompress an unsigned char buffer */
-unsigned decompress(std::vector<unsigned char>& out, const unsigned char* in, size_t insize,
+unsigned decompress(
+	std::vector<unsigned char> &out, const unsigned char *in, size_t insize,
 	const LodePNGDecompressSettings &settings = lodepng_default_decompress_settings);
 
 /* Zlib-decompress an std::vector */
-unsigned decompress(std::vector<unsigned char>& out, const std::vector<unsigned char>& in,
+unsigned decompress(
+	std::vector<unsigned char> &out, const std::vector<unsigned char> &in,
 	const LodePNGDecompressSettings &settings = lodepng_default_decompress_settings);
 #endif /* LODEPNG_COMPILE_DECODER */
 
 #ifdef LODEPNG_COMPILE_ENCODER
 /* Zlib-compress an unsigned char buffer */
-unsigned compress(std::vector<unsigned char>& out, const unsigned char* in, size_t insize,
+unsigned compress(
+	std::vector<unsigned char> &out, const unsigned char *in, size_t insize,
 	const LodePNGCompressSettings &settings = lodepng_default_compress_settings);
 
 /* Zlib-compress an std::vector */
-unsigned compress(std::vector<unsigned char>& out, const std::vector<unsigned char>& in,
+unsigned compress(
+	std::vector<unsigned char> &out, const std::vector<unsigned char> &in,
 	const LodePNGCompressSettings &settings = lodepng_default_compress_settings);
 #endif /* LODEPNG_COMPILE_ENCODER */
 #endif /* LODEPNG_COMPILE_ZLIB */
@@ -896,10 +858,10 @@ TODO:
 [X] let the "isFullyOpaque" function check color keys and transparent palettes too
 [X] better name for the variables "codes", "codesD", "codelengthcodes", "clcl" and "lldl"
 [ ] don't stop decoding on errors like 69, 57, 58 (make warnings)
-[ ] make warnings like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no null terminator in text, ...
+[ ] make warnings like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no null terminator in
-[ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes
+text, ... [ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes [ ]
-[ ] allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ...
+allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ... [ ]
-[ ] allow user to give data (void*) to custom allocator
+allow user to give data (void*) to custom allocator
 */
 
 #endif /*LODEPNG_H inclusion guard*/