Merge pull request #269 from raysan5/develop

Integrate develop branch

12 files changed, 13 insertions, 13 deletions

diff --git a/docs/examples/src/text/text_ttf_loading.c b/docs/examples/src/text/text_ttf_loading.c
index 4e490399..02b7f95f 100644
--- a/docs/examples/src/text/text_ttf_loading.c
+++ b/docs/examples/src/text/text_ttf_loading.c
@@ -25,7 +25,7 @@ int main()
     // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
     
     // TTF SpriteFont loading with custom generation parameters
-    SpriteFont font = LoadSpriteFontTTF("resources/KAISG.ttf", 96, 0, 0);
+    SpriteFont font = LoadSpriteFontEx("resources/KAISG.ttf", 96, 0, 0);
     
     // Generate mipmap levels to use trilinear filtering
     // NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
@@ -82,7 +82,7 @@ int main()
             if (count == 1) // Only support one ttf file dropped
             {
                 UnloadSpriteFont(font);
-                font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0);
+                font = LoadSpriteFontEx(droppedFiles[0], fontSize, 0, 0);
                 ClearDroppedFiles();
             }
         }
diff --git a/docs/examples/web/audio/loader.html b/docs/examples/web/audio/loader.html
index c5e18be0..93d7260f 100644
--- a/docs/examples/web/audio/loader.html
+++ b/docs/examples/web/audio/loader.html
@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 
diff --git a/docs/examples/web/core/loader.html b/docs/examples/web/core/loader.html
index c5e18be0..93d7260f 100644
--- a/docs/examples/web/core/loader.html
+++ b/docs/examples/web/core/loader.html
@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 
diff --git a/docs/examples/web/models/loader.html b/docs/examples/web/models/loader.html
index c5e18be0..93d7260f 100644
--- a/docs/examples/web/models/loader.html
+++ b/docs/examples/web/models/loader.html
@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 
diff --git a/docs/examples/web/physac/loader.html b/docs/examples/web/physac/loader.html
index c5e18be0..93d7260f 100644
--- a/docs/examples/web/physac/loader.html
+++ b/docs/examples/web/physac/loader.html
@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 
diff --git a/docs/examples/web/shaders/loader.html b/docs/examples/web/shaders/loader.html
index c5e18be0..93d7260f 100644
--- a/docs/examples/web/shaders/loader.html
+++ b/docs/examples/web/shaders/loader.html
@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 
diff --git a/docs/examples/web/shapes/loader.html b/docs/examples/web/shapes/loader.html
index c5e18be0..93d7260f 100644
--- a/docs/examples/web/shapes/loader.html
+++ b/docs/examples/web/shapes/loader.html
@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 
diff --git a/docs/examples/web/text/loader.html b/docs/examples/web/text/loader.html
index c5e18be0..93d7260f 100644
--- a/docs/examples/web/text/loader.html
+++ b/docs/examples/web/text/loader.html
@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 
diff --git a/docs/examples/web/text/text_ttf_loading.c b/docs/examples/web/text/text_ttf_loading.c
index 9dfdcac2..02097437 100644
--- a/docs/examples/web/text/text_ttf_loading.c
+++ b/docs/examples/web/text/text_ttf_loading.c
@@ -52,7 +52,7 @@ int main()
     // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
     
     // TTF SpriteFont loading with custom generation parameters
-    font = LoadSpriteFontTTF("resources/KAISG.ttf", 96, 0, 0);
+    font = LoadSpriteFontEx("resources/KAISG.ttf", 96, 0, 0);
     
     // Generate mipmap levels to use trilinear filtering
     // NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
@@ -130,7 +130,7 @@ void UpdateDrawFrame(void)
         if (count == 1) // Only support one ttf file dropped
         {
             UnloadSpriteFont(font);
-            font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0);
+            font = LoadSpriteFontEx(droppedFiles[0], fontSize, 0, 0);
             ClearDroppedFiles();
         }
     }
diff --git a/docs/examples/web/textures/loader.html b/docs/examples/web/textures/loader.html
index c5e18be0..93d7260f 100644
--- a/docs/examples/web/textures/loader.html
+++ b/docs/examples/web/textures/loader.html
@@ -36,7 +36,7 @@
 			}
             #eximage { width: 802px; height: 452px; text-align: center; }
 			#eximage img { margin: 0 auto; border: 1px solid; border-color: black; }
-            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; }
+            #eximage canvas { position: relative; top: 1px; left: 1px; border: 1px solid red; background: black; }
             pre { width: 802px!important;}
 			pre code{ border: 1px solid; border-color:#b0b0b0; height:auto; }
 			.exdownbtn{ margin-right: 20px; width:220px; height:30px; float:left; position: relative; cursor:pointer; font-weight:bold; font-size:10px; 
diff --git a/docs/examples/web/textures/resources/scarfy.png b/docs/examples/web/textures/resources/scarfy.png
index a377a712..beb5ffa0 100644
--- a/docs/examples/web/textures/resources/scarfy.png
+++ b/docs/examples/web/textures/resources/scarfy.png
diff --git a/docs/examples/web/textures/textures_raw_data.c b/docs/examples/web/textures/textures_raw_data.c
index 245af2e3..f06c798b 100644
--- a/docs/examples/web/textures/textures_raw_data.c
+++ b/docs/examples/web/textures/textures_raw_data.c
@@ -111,7 +111,7 @@ void UpdateDrawFrame(void)
 
         ClearBackground(RAYWHITE);
 
-        DrawTexture(checked, screenWidth/2 - checked.width/2, screenHeight/2 - checked.height/2, WHITE);
+        DrawTexture(checked, screenWidth/2 - checked.width/2, screenHeight/2 - checked.height/2, Fade(WHITE, 0.5f));
         DrawTexture(fudesumi, 430, -30, WHITE);
 
         DrawText("CHECKED TEXTURE ", 84, 100, 30, BROWN);