Merge pull request #28 from raysan5/develop

Integrating Develop branch

Author: raysan5

CHANGELOG

@@ -1,7 +1,7 @@
 changelog
 ---------
 
-Current Release:    raylib 1.3.0 (01 September 2015)
+Current Release:    raylib 1.3.0 (03 September 2015)
 
 NOTE: Only versions marked as 'Release' are available in installer, updates are only available as source.
 NOTE: Current Release includes all previous updates.
@@ -13,14 +13,14 @@ NOTE:
   This version supposed a big boost for raylib, new modules have been added with lots of features.
   Most of the modules have been completely reviewed to accomodate to the new features.
   Over 50 new functions have been added to previous raylib version.
-  Most of the examples have been redone and 10 new advanced examples have been added.
+  Most of the examples have been redone and +10 new advanced examples have been added.
 
 BIG changes:
+[rlgl] SHADERS: Support for model shaders and postprocessing shaders (multiple functions)
+[textures] FORMATS: Support for multiple internal formats, including compressed formats
 [camera] NEW MODULE: Set of cameras for 3d view: Free, Orbital, 1st person, 3rd person
 [gestures] NEW MODULE: Gestures system for Android and HTML5 platforms
-[raygui] NEW MODULE: Set of IMGUI elements for tools development
-[rlgl] SHADERS: Support for model shaders and postprocessing shaders (multiple functions)
-[textures] FORMATS: Added support for multiple internal formats, including compressed formats
+[raygui] NEW MODULE: Set of IMGUI elements for tools development (experimental)
 
 smaller changes:
 [rlgl] Added check for OpenGL supported extensions

README.md

@@ -8,10 +8,9 @@ raylib is a simple and easy-to-use library to learn videogames programming.
 raylib is highly inspired by Borland BGI graphics lib and by XNA framework. 
 Allegro and SDL have also been analyzed for reference.
 
-NOTE for ADVENTURERS: raylib is a programming library to learn videogames programming; no fancy interface, no visual helpers, no auto-debugging... just coding in the most pure spartan-programmers way. Are you ready to learn? Jump to [code examples!](http://www.raylib.com/examples.htm)
-
-Since version 1.2.2 raylib can compile directly for web (html5) using emscripten and asm.js, 
-to see a demo of raylib features working on web, [check here!](http://www.raylib.com/raylib_demo.html)
+NOTE for ADVENTURERS: raylib is a programming library to learn videogames programming; 
+no fancy interface, no visual helpers, no auto-debugging... just coding in the most 
+pure spartan-programmers way. Are you ready to learn? Jump to [code examples!](http://www.raylib.com/examples.htm)
 
 history
 -------
@@ -79,21 +78,24 @@ notes on raylib 1.3
 -------------------
 
 On September 2015, after 1 year of raylib 1.2 release, arrives raylib 1.3. This version adds shaders functionality,
-improves textures module and provides some new modules (camera system, gestures system, IMGUI).
+improves tremendously textures module and also provides some new modules (camera system, gestures system, IMGUI).
+
+Shaders support is the biggest addition to raylib 1.3, with support for easy shaders loading and use. Loaded shaders can be
+attached to 3d models or used as fullscreen postrocessing effects. A bunch of postprocessing shaders are also included
+in this release, check raylib/shaders folder.
 
-Shaders, the biggest addition to raylib, with support for simple and easy shaders loading and use. Loaded shaders can be
-assigned to models or used as fullscreen postrocessing shaders.
+Textures module has grown to support most of the internal texture formats available in OpenGL (RGB565, RGB888, RGBA5551, RGBA4444, etc.), 
+including compressed texture formats (DXT, ETC1, ETC2, ASTC, PVRT); raylib 1.3 can load .dds, .pkm, .ktx, .astc and .pvr files. 
 
-Textures module has been improved to support most of the internal texture formats available in OpenGL
-(RGB565, RGB888, RGBA5551, RGBA4444, etc.), including compressed texture formats (DXT, ETC1, ETC2, ASTC, PVRT).
+A brand new [camera](https://github.com/raysan5/raylib/blob/develop/src/camera.c) module offers to the user multiple preconfigured ready-to-use camera systems (free camera, 1st person, 3rd person).
+Camera modes are very easy to use, just check examples: [core_3d_camera_free.c](https://github.com/raysan5/raylib/blob/develop/examples/core_3d_camera_free.c) and [core_3d_camera_first_person.c](https://github.com/raysan5/raylib/blob/develop/examples/core_3d_camera_first_person.c).
 
-New camera module offers to the user multiple preconfigured ready-to-use camera systems (free camera, 1st person, 3rd person).
-Camera modes are very easy to use, just calling functions: SetCameraMode() and UpdateCamera().
+New [gestures](https://github.com/raysan5/raylib/blob/develop/src/gestures.h) module simplifies gestures detection on Android and HTML5 programs.
 
-New gestures module simplifies gestures detection on Android and HTML5 programs.
+[raygui](https://github.com/raysan5/raylib/blob/develop/src/raygui.h), the new IMGUI (Immediate Mode GUI) module offers a set of functions to create simple user interfaces,
+primary intended for tools development. It's still in experimental state but already fully functional.
 
-New IMGUI (Immediate Mode GUI) module: raygui, offers a set of functions to create simple user interfaces,
-primary intended for tools development, still in experimental state but already fully functional.
+Most of the examples have been completely rewritten and +10 new examples have been added to show the new raylib features.
 
 Lots of code changes and lot of testing have concluded in this amazing new raylib 1.3.
 
@@ -102,13 +104,11 @@ features
 
    *  Written in plain C code (C99)
    *  Uses C# PascalCase/camelCase notation
-   *  Hardware accelerated with OpenGL (1.1, 3.3+ or ES2)
-   *  Unique OpenGL abstraction layer: [rlgl](https://github.com/raysan5/raylib/blob/master/src/rlgl.c) 
    *  Hardware accelerated with OpenGL (1.1, 3.3 or ES2)
-   *  Unique OpenGL abstraction layer [rlgl]
+   *  Unique OpenGL abstraction layer: [rlgl](https://github.com/raysan5/raylib/blob/master/src/rlgl.c) 
    *  Powerful fonts module with SpriteFonts support
-   *  Multiple textures support, including DDS, PKM and mipmaps generation
-   *  Basic 3d support for Shapes, Models, Heightmaps and Billboards
+   *  Outstanding texture formats support, including compressed formats
+   *  Basic 3d support for Shapes, Models, Billboards, Heightmaps and Cubicmaps
    *  Powerful math module for Vector and Matrix operations: [raymath](https://github.com/raysan5/raylib/blob/master/src/raymath.c) 
    *  Audio loading and playing with streaming support (WAV and OGG)
    *  Custom color palette for fancy visuals on raywhite background

ROADMAP.md

@@ -10,11 +10,12 @@ raylib v1.4
 
    - TTF fonts support (using stb_truetype)
    - Raycast system for 3D picking (including collisions detection)
-   - Remove GLEW dependency (use another solution...)
+   - Remove GLEW dependency (use another solution... glad?)
    - Floyd-Steinberg dithering on 16bit image format conversion
    - Basic image manipulation functions (crop, resize, draw...)
    - Basic image procedural generation (spot, gradient, noise...)
    - Basic GPU stats sytem (memory, draws, time...)
+   - LUA scripting support (wrapper to lua lib)
 
 Check [GITHUB ISSUES][issues] for further details on implementation status for this features!
 

examples/audio_music_stream.c

@@ -4,10 +4,10 @@
 *
 *   NOTE: This example requires OpenAL Soft library installed
 *
-*   This example has been created using raylib 1.1 (www.raylib.com)
+*   This example has been created using raylib 1.3 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Copyright (c) 2014 Ramon Santamaria (@raysan5)
+*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 
@@ -61,9 +61,9 @@ int main()
         if (IsWindowMinimized()) PauseMusicStream();
         else ResumeMusicStream();
 
-        timePlayed = GetMusicTimePlayed() / GetMusicTimeLength() * 100 * 4; // We scale by 4 to fit 400 pixels
+        timePlayed = GetMusicTimePlayed()/GetMusicTimeLength()*100*4; // We scale by 4 to fit 400 pixels
 
-        UpdateMusicStream();
+        UpdateMusicStream();        // Update music buffer with new stream data
         //----------------------------------------------------------------------------------
 
         // Draw

examples/core_3d_camera_first_person.c

@@ -27,7 +27,7 @@ int main()
 
     // Generates some random columns
     float heights[MAX_COLUMNS];
-    Vector3 positions[MAX_COLUMNS] = { 0.0, 2.5, 0.0 };
+    Vector3 positions[MAX_COLUMNS];
     Color colors[MAX_COLUMNS];
 
     for (int i = 0; i < MAX_COLUMNS; i++)
@@ -76,7 +76,7 @@ int main()
 
             DrawText("First person camera default controls:", 20, 20, 10, GRAY);
             DrawText("- Move with keys: W, A, S, D", 40, 50, 10, DARKGRAY);
-            DrawText("- Mouse move to lokk around", 40, 70, 10, DARKGRAY);
+            DrawText("- Mouse move to look around", 40, 70, 10, DARKGRAY);
 
         EndDrawing();
         //----------------------------------------------------------------------------------

examples/core_3d_picking.c

@@ -5,7 +5,7 @@
 *   This example has been created using raylib 1.3 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Copyright (c) 2015 Ramon Santamaria (Ray San - [email protected])
+*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 

examples/core_basic_window_web.c

@@ -1,26 +1,22 @@
 /*******************************************************************************************
 *
-*   raylib [core] example - Basic window
+*   raylib [core] example - Basic window (adapted for HTML5 platform)
 *
-*   Welcome to raylib!
+*   This example is prepared to compile for PLATFORM_WEB, PLATFORM_DESKTOP and PLATFORM_RPI
+*   As you will notice, code structure is slightly diferent to the other examples...
+*   To compile it for PLATFORM_WEB just uncomment #define PLATFORM_WEB at beginning
 *
-*   To test examples, just press F6 and execute raylib_compile_execute script
-*   Note that compiled executable is placed in the same folder as .c file
-*
-*   You can find all basic examples on C:\raylib\raylib\examples folder or
-*   raylib official webpage: www.raylib.com
-*
-*   Enjoy using raylib. :)
-*
-*   This example has been created using raylib 1.0 (www.raylib.com)
+*   This example has been created using raylib 1.3 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Copyright (c) 2014 Ramon Santamaria (@raysan5)
+*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 
 #include "raylib.h"
 
+//#define PLATFORM_WEB
+
 #if defined(PLATFORM_WEB)
     #include <emscripten/emscripten.h>
 #endif

examples/core_drop_files.c

@@ -2,10 +2,12 @@
 *
 *   raylib [core] example - Windows drop files
 *
+*   This example only works on platforms that support drag & drop (Windows, Linux, OSX, Html5?)
+*
 *   This example has been created using raylib 1.3 (www.raylib.com)
 *   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
 *
-*   Copyright (c) 2014 Ramon Santamaria (Ray San - [email protected])
+*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
 *
 ********************************************************************************************/
 

examples/makefile

@@ -2,7 +2,7 @@
 #
 #   raylib makefile for desktop platforms, Raspberry Pi and HTML5 (emscripten)
 #
-#   Copyright (c) 2014 Ramon Santamaria (Ray San - [email protected])
+#   Copyright (c) 2015 Ramon Santamaria (@raysan5)
 #    
 #   This software is provided "as-is", without any express or implied warranty. In no event 
 #   will the authors be held liable for any damages arising from the use of this software.
@@ -154,9 +154,14 @@ EXAMPLES = \
     core_input_keys \
     core_input_mouse \
     core_mouse_wheel \
+    core_input_gamepad \
     core_random_values \
     core_color_select \
+    core_drop_files \
     core_3d_mode \
+    core_3d_picking \
+    core_3d_camera_free \
+    core_3d_camera_first_person \
     shapes_logo_raylib \
     shapes_basic_shapes \
     shapes_colors_palette \
@@ -165,16 +170,24 @@ EXAMPLES = \
     textures_image_loading \
     textures_rectangle \
     textures_srcrec_dstrec \
+    textures_to_image \
+    textures_raw_data \
+    textures_formats_loading \
+    textures_particles_trail_blending \
     text_sprite_fonts \
     text_rbmf_fonts \
     text_format_text \
     text_font_select \
     models_geometric_shapes \
-    models_planes \
+    models_box_collisions \
     models_billboard \
     models_obj_loading \
     models_heightmap \
     models_cubicmap \
+    shaders_model_shader \
+    shaders_shapes_textures \
+    shaders_custom_uniform \
+    shaders_postprocessing \
     audio_sound_loading \
     audio_music_stream \
     fix_dylib \
@@ -201,16 +214,26 @@ core_input_keys: core_input_keys.c
 core_input_mouse: core_input_mouse.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 # compile [core] example - gamepad input
 core_input_gamepad: core_input_gamepad.c
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+else
+	@echo core_input_gamepad: Only supported on desktop platform
 endif
 
 # compile [core] example - mouse wheel
 core_mouse_wheel: core_mouse_wheel.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 
+# compile [core] example - drop files
+core_drop_files: core_drop_files.c
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+else
+	@echo core_drop_files: Only supported on desktop platform
+endif
+    
 # compile [core] example - generate random values
 core_random_values: core_random_values.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
@@ -223,6 +246,18 @@ core_color_select: core_color_select.c
 core_3d_mode: core_3d_mode.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 
+# compile [core] example - 3d picking
+core_3d_picking: core_3d_picking.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile [core] example - 3d camera free
+core_3d_camera_free: core_3d_camera_free.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile [core] example - 3d camera first person
+core_3d_camera_first_person: core_3d_camera_first_person.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)    
+    
 # compile [shapes] example - raylib logo (with basic shapes)
 shapes_logo_raylib: shapes_logo_raylib.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
@@ -255,6 +290,22 @@ textures_rectangle: textures_rectangle.c
 textures_srcrec_dstrec: textures_srcrec_dstrec.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 
+# compile [textures] example - texture to image
+textures_to_image: textures_to_image.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile [textures] example - texture raw data
+textures_raw_data: textures_raw_data.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile [textures] example - texture formats loading
+textures_formats_loading: textures_formats_loading.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile [textures] example - texture particles trail blending
+textures_particles_trail_blending: textures_particles_trail_blending.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
 # compile [text] example - sprite fonts loading
 text_sprite_fonts: text_sprite_fonts.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
@@ -275,6 +326,10 @@ text_font_select: text_font_select.c
 models_geometric_shapes: models_geometric_shapes.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 
+# compile [models] example - box collisions
+models_box_collisions: models_box_collisions.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
 # compile [models] example - basic window
 models_planes: models_planes.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
@@ -295,6 +350,22 @@ models_heightmap: models_heightmap.c
 models_cubicmap: models_cubicmap.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 
+# compile [shaders] example - model shader
+shaders_model_shader: shaders_model_shader.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile [shaders] example - shapes texture shader
+shaders_shapes_textures: shaders_shapes_textures.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile [shaders] example - custom uniform in shader
+shaders_custom_uniform: shaders_custom_uniform.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
+# compile [shaders] example - postprocessing shader
+shaders_postprocessing: shaders_postprocessing.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+    
 # compile [audio] example - sound loading and playing (WAV and OGG)
 audio_sound_loading: audio_sound_loading.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)