From 294533ccda115b5e638ab1f9219f86d73c9c4550 Mon Sep 17 00:00:00 2001
From: raysan5 <raysan5@gmail.com>
Date: Sat, 30 Nov 2013 18:12:40 +0100
Subject: [PATCH] Updated to version 1.0.2

Some functions added (collision detection)
Check CHANGELOG for details
---
 README.md                            |   2 +-
 release/win32-mingw/include/raylib.h |   9 ++-
 release/win32-mingw/lib/libraylib.a  | Bin 133040 -> 135180 bytes
 src/models.c                         |  40 +++++++++--
 src/raylib.h                         |   8 ++-
 src/shapes.c                         |  99 ++++++++++++++++++++++++++-
 src/textures.c                       |  30 ++++++++
 7 files changed, 179 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index dbcd7a856..ebb528ebf 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ raylib has been developed using exclusively two tools:
    * Notepad++ (text editor) - [http://notepad-plus-plus.org/](http://notepad-plus-plus.org/)
    * MinGW (GCC compiler) - [http://www.mingw.org/](http://www.mingw.org/)
    
-Those are the tools I recommended to develop with raylib, actually, my students develop using this tools. 
+Those are the tools I recommend to develop with raylib, in fact, those are the tools my students use. 
 I believe those are the best tools to train spartan-programmers.
 
 Someone could argue about debugging. raylib is a library intended for learning and I think C it's a clear enough language
diff --git a/release/win32-mingw/include/raylib.h b/release/win32-mingw/include/raylib.h
index 14a3300ee..7f14113f7 100644
--- a/release/win32-mingw/include/raylib.h
+++ b/release/win32-mingw/include/raylib.h
@@ -1,6 +1,6 @@
 /*********************************************************************************************
 * 
-*   raylib 1.0.1 (www.raylib.com)
+*   raylib 1.0.2 (www.raylib.com)
 *    
 *   A simple and easy-to-use library to learn C videogames programming
 *
@@ -301,6 +301,11 @@ void DrawTriangleLines(Vector2 v1, Vector2 v2, Vector2 v3, Color color);
 void DrawPoly(Vector2 *points, int numPoints, Color color);                                        // Draw a closed polygon defined by points
 void DrawPolyLine(Vector2 *points, int numPoints, Color color);                                    // Draw polygon lines
 
+bool CheckCollisionRecs(Rectangle rec1, Rectangle rec2);                                           // Check collision between two rectangles
+bool CheckCollisionCircles(Vector2 center1, float radius1, Vector2 center2, float radius2);        // Check collision between two circles
+bool CheckCollisionCircleRec(Vector2 center, float radius, Rectangle rec);                         // Check collision between circle and rectangle
+Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2);                                         // Get collision rectangle for two rectangles collision
+
 //------------------------------------------------------------------------------------
 // Texture Loading and Drawing Functions (Module: textures)
 //------------------------------------------------------------------------------------
@@ -313,10 +318,12 @@ void DrawTexture(Texture2D texture, int posX, int posY, Color tint);
 void DrawTextureEx(Texture2D texture, Vector2 position, float rotation, float scale, Color tint);  // Draw a Texture2D with extended parameters
 void DrawTextureRec(Texture2D texture, Rectangle sourceRec, Vector2 position, Color tint);         // Draw a part of a texture defined by a rectangle
 void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle destRec, Vector2 origin, float rotation, Color tint); // Draw a part of a texture defined by a rectangle with 'pro' parameters
+Texture2D CreateTexture2D(Image image);                                                            // Create a Texture2D from Image data
 
 //------------------------------------------------------------------------------------
 // Font Loading and Text Drawing Functions (Module: text)
 //------------------------------------------------------------------------------------
+SpriteFont GetDefaultFont();                                                                       // Get the default SpriteFont
 SpriteFont LoadSpriteFont(const char *fileName);                                                   // Load a SpriteFont image into GPU memory
 void UnloadSpriteFont(SpriteFont spriteFont);                                                      // Unload SpriteFont from GPU memory
 void DrawText(const char *text, int posX, int posY, int fontSize, Color color);                    // Draw text (using default font)
diff --git a/release/win32-mingw/lib/libraylib.a b/release/win32-mingw/lib/libraylib.a
index 028e78705343d0b8fd71bd65ee29e6104d3f42d9..f07e2f65184a1a923aa5902edbf6af6886dbee9d 100644
GIT binary patch
delta 15960
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
H#sX0Q<_(ht

delta 13979
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

diff --git a/src/models.c b/src/models.c
index e15ea31f6..8e4f35553 100644
--- a/src/models.c
+++ b/src/models.c
@@ -662,6 +662,38 @@ Model LoadModel(const char *fileName)
     return model;
 }
 
+// Load a heightmap image as a 3d model
+// TODO: Just do it...
+Model LoadHeightmap(Image heightmap, Vector3 resolution)
+{
+    Model model;
+    
+    int mapX = heightmap.width;
+	int mapZ = heightmap.height;
+    
+    // NOTE: One vertex per pixel
+    // TODO: Consider resolution when generating model data?
+    int numTriangles = (mapX-1)*(mapZ-1)*2;    // One quad every four pixels
+  
+    model.numVertices = numTriangles*3;
+
+    model.vertices = (Vector3 *)malloc(model.numVertices * sizeof(Vector3));
+    model.normals = (Vector3 *)malloc(model.numVertices * sizeof(Vector3));
+    model.texcoords = (Vector2 *)malloc(model.numVertices * sizeof(Vector2));
+
+	for(int z = 0; z < mapZ; z++)
+	{
+		for(int x = 0; x < mapX; x++)
+		{
+			// TODO: Fill vertices array with data
+		}
+	}
+
+	//SmoothHeightmap(&model);    // TODO: Smooth vertex interpolation
+    
+    return model;
+}
+
 // Unload 3d model from memory
 void UnloadModel(Model model)
 {
@@ -743,9 +775,9 @@ void DrawBillboard(Camera camera, Texture2D texture, Vector3 basePos, float size
 void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle sourceRec, Vector3 basePos, float size, Color tint)
 {
     // NOTE: Billboard size will represent the width, height maintains aspect ratio
-    Vector3 centerPos = { basePos.x, basePos.y + size * (float)texture.height/(float)texture.width/2, basePos.z };
-    Vector2 sizeRatio = { size, size * (float)texture.height/texture.width };
-    Vector3 rotation = { 90, 0, 0 };
+    //Vector3 centerPos = { basePos.x, basePos.y + size * (float)texture.height/(float)texture.width/2, basePos.z };
+    //Vector2 sizeRatio = { size, size * (float)texture.height/texture.width };
+    //Vector3 rotation = { 90, 0, 0 };
     
     // TODO: Calculate Y rotation to face always camera (use matrix)
     // OPTION: Lock Y-axis
@@ -766,7 +798,7 @@ void DrawHeightmap(Image heightmap, Vector3 centerPos, Vector3 scale, Color colo
     // NOTE: Heightmap resolution will depend on image size (one quad per pixel)
 
     // TODO: Review how this function works... probably we need:
-    // Model LoadHeightmap(Image image, Vector3 resolution);
+    // Model LoadHeightmap(Image heightmap, Vector3 resolution);
     
     // NOTE: We are allocating and de-allocating vertex data every frame! --> framerate drops 80%! CRAZY!
     Vector3 *terrainVertex = (Vector3 *)malloc(heightmap.width * heightmap.height * sizeof(Vector3));
diff --git a/src/raylib.h b/src/raylib.h
index 54065dd0a..7f14113f7 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -1,6 +1,6 @@
 /*********************************************************************************************
 * 
-*   raylib 1.0.1 (www.raylib.com)
+*   raylib 1.0.2 (www.raylib.com)
 *    
 *   A simple and easy-to-use library to learn C videogames programming
 *
@@ -301,6 +301,11 @@ void DrawTriangleLines(Vector2 v1, Vector2 v2, Vector2 v3, Color color);
 void DrawPoly(Vector2 *points, int numPoints, Color color);                                        // Draw a closed polygon defined by points
 void DrawPolyLine(Vector2 *points, int numPoints, Color color);                                    // Draw polygon lines
 
+bool CheckCollisionRecs(Rectangle rec1, Rectangle rec2);                                           // Check collision between two rectangles
+bool CheckCollisionCircles(Vector2 center1, float radius1, Vector2 center2, float radius2);        // Check collision between two circles
+bool CheckCollisionCircleRec(Vector2 center, float radius, Rectangle rec);                         // Check collision between circle and rectangle
+Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2);                                         // Get collision rectangle for two rectangles collision
+
 //------------------------------------------------------------------------------------
 // Texture Loading and Drawing Functions (Module: textures)
 //------------------------------------------------------------------------------------
@@ -313,6 +318,7 @@ void DrawTexture(Texture2D texture, int posX, int posY, Color tint);
 void DrawTextureEx(Texture2D texture, Vector2 position, float rotation, float scale, Color tint);  // Draw a Texture2D with extended parameters
 void DrawTextureRec(Texture2D texture, Rectangle sourceRec, Vector2 position, Color tint);         // Draw a part of a texture defined by a rectangle
 void DrawTexturePro(Texture2D texture, Rectangle sourceRec, Rectangle destRec, Vector2 origin, float rotation, Color tint); // Draw a part of a texture defined by a rectangle with 'pro' parameters
+Texture2D CreateTexture2D(Image image);                                                            // Create a Texture2D from Image data
 
 //------------------------------------------------------------------------------------
 // Font Loading and Text Drawing Functions (Module: text)
diff --git a/src/shapes.c b/src/shapes.c
index ea55f1985..564676654 100644
--- a/src/shapes.c
+++ b/src/shapes.c
@@ -2,7 +2,7 @@
 *
 *   raylib.shapes
 *
-*   Basic functions to draw 2d Shapes
+*   Basic functions to draw 2d Shapes and check collisions
 *     
 *   Copyright (c) 2013 Ramon Santamaria (Ray San - raysan@raysanweb.com)
 *    
@@ -26,7 +26,9 @@
 #include "raylib.h"
 
 #include <GL/gl.h>      // OpenGL functions
+#include <stdlib.h>     // Required for abs() function
 #include <math.h>       // Math related functions, sin() and cos() used on DrawCircle*
+                        // sqrt() and pow() and abs() used on CheckCollision*
 
 //----------------------------------------------------------------------------------
 // Defines and Macros
@@ -323,4 +325,97 @@ void DrawPolyLine(Vector2 *points, int numPoints, Color color)
         
         //glDisable(GL_LINE_SMOOTH);
     }
-}                                                
+}
+
+// Check collision between two rectangles
+bool CheckCollisionRecs(Rectangle rec1, Rectangle rec2)
+{
+    bool collision = false;
+    
+    int dx = abs((rec1.x + rec1.width / 2) - (rec2.x + rec2.width / 2));
+    int dy = abs((rec1.y + rec1.height / 2) - (rec2.y + rec2.height / 2));
+    
+    if ((dx <= (rec1.width / 2 + rec2.width / 2)) && ((dy <= (rec1.height / 2 + rec2.height / 2)))) collision = true;
+    
+    return collision;
+}
+
+// Check collision between two circles
+bool CheckCollisionCircles(Vector2 center1, float radius1, Vector2 center2, float radius2)
+{
+    bool collision = false;
+    
+    float dx = center2.x - center1.x;      // X distance between centers
+    float dy = center2.y - center1.y;      // Y distance between centers
+    
+    float distance = sqrt(dx*dx + dy*dy);  // Distance between centers
+    
+    if (distance <= (radius1 + radius2)) collision = true;
+    
+    return collision;
+}
+
+// Check collision between circle and rectangle
+bool CheckCollisionCircleRec(Vector2 center, float radius, Rectangle rec)
+{
+    bool collision = false;
+    
+    float dx = abs((rec.x + rec.width / 2) - center.x);
+    float dy = abs((rec.y + rec.height / 2) - center.y);
+    
+    if ((dx <= (rec.width / 2 + radius)) && (dy <= (rec.height / 2 + radius))) collision = true;
+    
+    return collision;
+}
+
+// Get collision rectangle for two rectangles collision
+Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2)
+{
+    Rectangle retRec = { 0, 0, 0, 0 };
+    
+    if (CheckCollisionRecs(rec1, rec2))
+    {
+        int dxx = abs(rec1.x - rec2.x);
+        int dyy = abs(rec1.y - rec2.y);
+        
+        if (rec1.x <= rec2.x)
+        {
+            if (rec1.y <= rec2.y)
+            {	
+                retRec.x = rec2.x;
+                retRec.y = rec2.y;
+                retRec.width = rec1.width - dxx;
+                retRec.height = rec1.height - dyy;
+            }
+            else
+            {
+                retRec.x = rec2.x;
+                retRec.y = rec1.y;
+                retRec.width = rec1.width - dxx;
+                retRec.height = rec2.height - dyy;
+            }
+        }
+        else
+        {
+            if (rec1.y <= rec2.y)
+            {	
+                retRec.x = rec1.x;
+                retRec.y = rec2.y;
+                retRec.width = rec2.width - dxx;
+                retRec.height = rec1.height - dyy;
+            }
+            else
+            {
+                retRec.x = rec1.x;
+                retRec.y = rec1.y;
+                retRec.width = rec2.width - dxx;
+                retRec.height = rec2.height - dyy;
+            }
+        }
+        
+        if (retRec.width >= rec2.width) retRec.width = rec2.width;
+        if (retRec.height >= rec2.height) retRec.height = rec2.height;
+    }
+    
+    return retRec;
+}                                    
diff --git a/src/textures.c b/src/textures.c
index 3ccb5358a..19eb09b42 100644
--- a/src/textures.c
+++ b/src/textures.c
@@ -157,6 +157,36 @@ Texture2D LoadTextureEx(const char *fileName, bool createPOT, bool mipmaps)
     return texture;
 }
 
+// Create a Texture2D from Image data
+// NOTE: Image is not unloaded, it should be done manually...
+Texture2D CreateTexture2D(Image image)
+{
+    Texture2D texture;
+    
+    // Convert image data to OpenGL texture
+    //----------------------------------------
+    GLuint id;
+    glGenTextures(1, &id);         // Generate Pointer to the Texture
+    
+    glBindTexture(GL_TEXTURE_2D, id);
+    
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);       // Set texture to repead on x-axis
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);       // Set texture to repead on y-axis
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);  // Filter for pixel-perfect drawing, alternative: GL_LINEAR 
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);  // Filter for pixel-perfect drawing, alternative: GL_LINEAR
+    
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, image.width, image.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, image.pixels);
+    
+    // NOTE: Not using mipmappings (texture for 2D drawing)
+    // At this point we have the image converted to texture and uploaded to GPU
+    
+    texture.glId = id;
+    texture.width = image.width;
+    texture.height = image.height;
+    
+    return texture;
+}
+
 // Unload texture from GPU memory
 void UnloadTexture(Texture2D texture)
 {