Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop

docs/examples/web/audio_music_stream.c

@@ -25,6 +25,9 @@ int screenHeight = 450;
 
 int framesCounter = 0;
 float timePlayed = 0.0f;
+static bool pause = false;
+
+Music music;
 
 //----------------------------------------------------------------------------------
 // Module Functions Declaration
@@ -42,7 +45,9 @@ int main()
     
     InitAudioDevice();              // Initialize audio device
 
-    PlayMusicStream(0, "resources/audio/guitar_noodling.ogg");         // Play music stream
+    music = LoadMusicStream("resources/audio/guitar_noodling.ogg");
+    
+    PlayMusicStream(music);
     
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);
@@ -59,6 +64,8 @@ int main()
 
     // De-Initialization
     //--------------------------------------------------------------------------------------
+    UnloadMusicStream(music);   // Unload music stream buffers from RAM
+
     CloseAudioDevice();     // Close audio device (music streaming is automatically stopped)
     CloseWindow();        // Close window and OpenGL context
     //--------------------------------------------------------------------------------------
@@ -73,33 +80,26 @@ void UpdateDrawFrame(void)
 {
     // Update
     //----------------------------------------------------------------------------------
-    framesCounter++;
+    UpdateMusicStream(music);        // Update music buffer with new stream data
     
-    // Testing music fading from one file to another
-/*
-        if (framesCounter > 600)    // Wait for 10 seconds (600 frames)
-        {
-            volume -= 0.01;         // Decrement music volume level
-
-            // When music volume level equal or lower than 0,
-            // restore volume level and init another music file
-            if (volume <= 0)
-            {
-                volume = 1.0;
-                framesCounter = 0;
-                PlayMusicStream(1, "resources/audio/another_file.ogg");
-            }
-
-            SetMusicVolume(volume);
-        }
-*/
+    // Restart music playing (stop and play)
+    if (IsKeyPressed(KEY_SPACE)) 
+    {
+        StopMusicStream(music);
+        PlayMusicStream(music);
+    }
     
-    if (IsWindowMinimized()) PauseMusicStream(0);
-    else ResumeMusicStream(0);
-
-    timePlayed = GetMusicTimePlayed(0)/GetMusicTimeLength(0)*100*4; // We scale by 4 to fit 400 pixels
+    // Pause/Resume music playing 
+    if (IsKeyPressed(KEY_P))
+    {
+        pause = !pause;
+        
+        if (pause) PauseMusicStream(music);
+        else ResumeMusicStream(music);
+    }
     
-    UpdateMusicStream(0);        // Update music buffer with new stream data
+    // Get timePlayed scaled to bar dimensions (400 pixels)
+    timePlayed = GetMusicTimePlayed(music)/GetMusicTimeLength(music)*400;
     //----------------------------------------------------------------------------------
 
     // Draw
@@ -108,11 +108,14 @@ void UpdateDrawFrame(void)
 
         ClearBackground(RAYWHITE);
 
-        DrawText("MUSIC SHOULD BE PLAYING!", 255, 200, 20, LIGHTGRAY);
+        DrawText("MUSIC SHOULD BE PLAYING!", 255, 150, 20, LIGHTGRAY);
 
-        DrawRectangle(200, 250, 400, 12, LIGHTGRAY);
-        DrawRectangle(200, 250, (int)timePlayed, 12, MAROON); 
+        DrawRectangle(200, 200, 400, 12, LIGHTGRAY);
+        DrawRectangle(200, 200, (int)timePlayed, 12, MAROON);
+        DrawRectangleLines(200, 200, 400, 12, GRAY);
         
+        DrawText("PRESS SPACE TO RESTART MUSIC", 215, 250, 20, LIGHTGRAY);
+        DrawText("PRESS P TO PAUSE/RESUME MUSIC", 208, 280, 20, LIGHTGRAY);
         
     EndDrawing();
     //----------------------------------------------------------------------------------

docs/examples/web/audio_raw_stream.c

@@ -0,0 +1,114 @@
+/*******************************************************************************************
+*
+*   raylib [audio] example - Raw audio streaming
+*
+*   NOTE: This example requires OpenAL Soft library installed
+*
+*   This example has been created using raylib 1.6 (www.raylib.com)
+*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*
+*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
+*
+********************************************************************************************/
+
+#include "raylib.h"
+
+#include <stdlib.h>         // Required for: malloc(), free()
+#include <math.h>           // Required for: sinf()
+
+#define MAX_SAMPLES             22050
+#define MAX_SAMPLES_PER_UPDATE   4096
+
+int main()
+{
+    // Initialization
+    //--------------------------------------------------------------------------------------
+    int screenWidth = 800;
+    int screenHeight = 450;
+
+    InitWindow(screenWidth, screenHeight, "raylib [audio] example - raw audio streaming");
+
+    InitAudioDevice();              // Initialize audio device
+
+    // Init raw audio stream (sample rate: 22050, sample size: 16bit-short, channels: 1-mono)
+    AudioStream stream = InitAudioStream(22050, 16, 1);
+    
+    // Generate samples data from sine wave
+    short *data = (short *)malloc(sizeof(short)*MAX_SAMPLES);
+    
+    // TODO: Review data generation, it seems data is discontinued for loop,
+    // for that reason, there is a clip everytime audio stream is looped...
+    for (int i = 0; i < MAX_SAMPLES; i++)
+    {
+        data[i] = (short)(sinf(((2*PI*(float)i)/2)*DEG2RAD)*32000);
+    }
+    
+    PlayAudioStream(stream);        // Start processing stream buffer (no data loaded currently)
+    
+    int totalSamples = MAX_SAMPLES;
+    int samplesLeft = totalSamples;
+    
+    Vector2 position = { 0, 0 };
+
+    SetTargetFPS(30);               // Set our game to run at 30 frames-per-second
+    //--------------------------------------------------------------------------------------
+
+    // Main game loop
+    while (!WindowShouldClose())    // Detect window close button or ESC key
+    {
+        // Update
+        //----------------------------------------------------------------------------------
+        
+        // Refill audio stream if required
+        // NOTE: Every update we check if stream data has been already consumed and we update
+        // buffer with new data from the generated samples, we upload data at a rate (MAX_SAMPLES_PER_UPDATE),
+        // but notice that at some point we update < MAX_SAMPLES_PER_UPDATE data...
+        if (IsAudioBufferProcessed(stream)) 
+        {
+            int numSamples = 0;
+            if (samplesLeft >= MAX_SAMPLES_PER_UPDATE) numSamples = MAX_SAMPLES_PER_UPDATE;
+            else numSamples = samplesLeft;
+
+            UpdateAudioStream(stream, data + (totalSamples - samplesLeft), numSamples);
+            
+            samplesLeft -= numSamples;
+            
+            // Reset samples feeding (loop audio)
+            if (samplesLeft <= 0) samplesLeft = totalSamples;
+        }
+        //----------------------------------------------------------------------------------
+
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            DrawText("SINE WAVE SHOULD BE PLAYING!", 240, 140, 20, LIGHTGRAY);
+            
+            // NOTE: Draw a part of the sine wave (only screen width, proportional values)
+            for (int i = 0; i < GetScreenWidth(); i++)
+            {
+                position.x = i;
+                position.y = 250 + 50*data[i]/32000;
+                
+                DrawPixelV(position, RED);
+            }
+
+        EndDrawing();
+        //----------------------------------------------------------------------------------
+    }
+
+    // De-Initialization
+    //--------------------------------------------------------------------------------------
+    free(data);                 // Unload sine wave data
+    
+    CloseAudioStream(stream);   // Close raw audio stream and delete buffers from RAM
+
+    CloseAudioDevice();         // Close audio device (music streaming is automatically stopped)
+
+    CloseWindow();              // Close window and OpenGL context
+    //--------------------------------------------------------------------------------------
+
+    return 0;
+}

docs/examples/web/core_3d_camera_first_person.c

@@ -56,9 +56,8 @@ int main()
         colors[i] = (Color){ GetRandomValue(20, 255), GetRandomValue(10, 55), 30, 255 };
     }
     
-    SetCameraMode(CAMERA_FIRST_PERSON);         // Set a first person camera mode
-    SetCameraFovy(camera.fovy);                 // Set internal camera field-of-view Y
-	
+    SetCameraMode(camera, CAMERA_FIRST_PERSON);         // Set a first person camera mode
+
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);
 #else
@@ -88,7 +87,7 @@ void UpdateDrawFrame(void)
 {
     // Update
     //----------------------------------------------------------------------------------
-    UpdateCameraPlayer(&camera, &playerPosition); // Update camera and player position
+    UpdateCamera(&camera);          // Update camera and player position
     //----------------------------------------------------------------------------------
 
     // Draw

docs/examples/web/core_3d_camera_free.c

@@ -47,10 +47,7 @@ int main()
     camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
     camera.fovy = 45.0f;                                // Camera field-of-view Y
     
-    SetCameraMode(CAMERA_FREE);         // Set a free camera mode
-    SetCameraPosition(camera.position); // Set internal camera position to match our camera position
-    SetCameraTarget(camera.target);     // Set internal camera target to match our camera target
-    SetCameraFovy(camera.fovy);         // Set internal camera field-of-view Y
+    SetCameraMode(camera, CAMERA_FREE);                 // Set a free camera mode
 
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);

docs/examples/web/core_3d_picking.c

@@ -50,9 +50,7 @@ int main()
     camera.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target)
     camera.fovy = 45.0f;                                // Camera field-of-view Y
 
-    SetCameraMode(CAMERA_FREE);         // Set a free camera mode
-    SetCameraPosition(camera.position); // Set internal camera position to match our camera position
-    SetCameraFovy(camera.fovy);         // Set internal camera field-of-view Y
+    SetCameraMode(camera, CAMERA_FREE);                 // Set a free camera mode
 
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);

docs/examples/web/core_world_screen.c

@@ -42,9 +42,7 @@ int main()
     //--------------------------------------------------------------------------------------
     InitWindow(screenWidth, screenHeight, "raylib [core] example - 3d camera free");
     
-    SetCameraMode(CAMERA_FREE);         // Set a free camera mode
-    SetCameraPosition(camera.position); // Set internal camera position to match our camera position
-    SetCameraTarget(camera.target);     // Set internal camera target to match our camera target
+    SetCameraMode(camera, CAMERA_FREE);         // Set a free camera mode
 
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);

docs/examples/web/makefile

@@ -2,16 +2,18 @@
 #
 #   raylib makefile for desktop platforms, Raspberry Pi and HTML5 (emscripten)
 #
-#   Copyright (c) 2015 Ramon Santamaria (@raysan5)
+#   NOTE: By default examples are compiled using raylib static library and OpenAL Soft shared library
 #
-#   This software is provided "as-is", without any express or implied warranty. In no event 
+#   Copyright (c) 2013-2016 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.
 #
-#   Permission is granted to anyone to use this software for any purpose, including commercial 
+#   Permission is granted to anyone to use this software for any purpose, including commercial
 #   applications, and to alter it and redistribute it freely, subject to the following restrictions:
 #
-#     1. The origin of this software must not be misrepresented; you must not claim that you 
-#     wrote the original software. If you use this software in a product, an acknowledgment 
+#     1. The origin of this software must not be misrepresented; you must not claim that you
+#     wrote the original software. If you use this software in a product, an acknowledgment
 #     in the product documentation would be appreciated but is not required.
 #
 #     2. Altered source versions must be plainly marked as such, and must not be misrepresented
@@ -26,6 +28,9 @@
 # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop()
 PLATFORM ?= PLATFORM_DESKTOP
 
+# define NO to use OpenAL Soft as static library (shared by default)
+SHARED_OPENAL ?= NO
+
 # determine PLATFORM_OS in case PLATFORM_DESKTOP selected
 ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     # No uname.exe on MinGW!, but OS=Windows_NT on Windows! ifeq ($(UNAME),Msys) -> Windows
@@ -61,50 +66,95 @@ endif
 endif
 
 # define compiler flags:
-#  -O2         defines optimization level
-#  -Wall       turns on most, but not all, compiler warnings
-#  -std=c99    use standard C from 1999 revision
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    CFLAGS = -O2 -Wall -std=gnu99 -fgnu89-inline
-else
-    CFLAGS = -O2 -Wall -std=c99
+#  -O2                  defines optimization level
+#  -Og                  enable debugging
+#  -s                   strip unnecessary data from build
+#  -Wall                turns on most, but not all, compiler warnings
+#  -std=c99             defines C language mode (standard C from 1999 revision)
+#  -std=gnu99           defines C language mode (GNU C from 1999 revision)
+#  -fgnu89-inline       declaring inline functions support (GCC optimized)
+#  -Wno-missing-braces  ignore invalid warning (GCC bug 53119)
+#  -D_DEFAULT_SOURCE    use with -std=c99 on Linux to enable timespec and drflac
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        CFLAGS = -O2 -s -Wall -std=c99
+    endif
+    ifeq ($(PLATFORM_OS),LINUX)
+        CFLAGS = -O2 -s -Wall -std=c99 -D_DEFAULT_SOURCE
+    endif
+    ifeq ($(PLATFORM_OS),OSX)
+        CFLAGS = -O2 -s -Wall -std=c99
+    endif
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
-    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3
-    #-s ASSERTIONS=1            # to check for memory allocation errors (-O1 disables it)
-    #-s ALLOW_MEMORY_GROWTH=1   # to allow memory resizing
-    #-s TOTAL_MEMORY=16777216   # to specify heap memory size (default = 16MB)
+    CFLAGS = -O1 -Wall -std=c99 -s USE_GLFW=3 -s ASSERTIONS=1 --profiling
+    # -O2                        # if used, also set --memory-init-file 0
+    # --memory-init-file 0       # to avoid an external memory initialization code file (.mem)
+    #-s ALLOW_MEMORY_GROWTH=1    # to allow memory resizing
+    #-s TOTAL_MEMORY=16777216    # to specify heap memory size (default = 16MB)
+endif
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    CFLAGS = -O2 -s -Wall -std=gnu99 -fgnu89-inline
 endif
-
 #CFLAGSEXTRA = -Wextra -Wmissing-prototypes -Wstrict-prototypes
 
+# define raylib release directory for compiled library
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        RAYLIB_PATH = ../release/win32/mingw32
+    endif
+    ifeq ($(PLATFORM_OS),LINUX)
+        RAYLIB_PATH = ../release/linux
+    endif
+    ifeq ($(PLATFORM_OS),OSX)
+        RAYLIB_PATH = ../release/osx
+    endif
+endif
+ifeq ($(PLATFORM),PLATFORM_WEB)
+    RAYLIB_PATH = ../release/html5
+endif
+ifeq ($(PLATFORM),PLATFORM_RPI)
+    RAYLIB_PATH = ../release/rpi
+endif
+
 # define any directories containing required header files
+INCLUDES = -I. -I../../../src -I../src/external -I$(RAYLIB_PATH)
+
 ifeq ($(PLATFORM),PLATFORM_RPI)
-    INCLUDES = -I. -I../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
-else
-    INCLUDES = -I. -I../src -I../github/raylib/src
-# external libraries headers
-# GLFW3
-    INCLUDES += -I../external/glfw3/include
-# GLEW: Not required any more, replaced by GLAD
-    #INCLUDES += -I../external/glew/include
-# OpenAL Soft
-    INCLUDES += -I../external/openal_soft/include
+    INCLUDES += -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        # external libraries headers
+        # GLFW3
+            INCLUDES += -I../src/external/glfw3/include
+        # OpenAL Soft
+            INCLUDES += -I../src/external/openal_soft/include
+    endif
+    ifeq ($(PLATFORM_OS),LINUX)
+        # you may optionally create this directory and install raylib 
+        # and related headers there. Edit ../src/Makefile appropriately.
+            INCLUDES += -I/usr/local/include/raylib
+    endif
+    ifeq ($(PLATFORM_OS),OSX)
+        # additional directories for MacOS
+    endif
 endif
 
 # define library paths containing required libs
+LFLAGS = -L. -L../src -L$(RAYLIB_PATH)
+
 ifeq ($(PLATFORM),PLATFORM_RPI)
-    LFLAGS = -L. -L../src -L/opt/vc/lib
-else
-    LFLAGS = -L. -L../src
-# external libraries to link with
-# GLFW3
-    LFLAGS += -L../external/glfw3/lib/$(LIBPATH)
-    ifneq ($(PLATFORM_OS),OSX)
-    # OpenAL Soft
-        LFLAGS += -L../external/openal_soft/lib/$(LIBPATH)
-    # GLEW: Not required any more, replaced by GLAD
-        #LFLAGS += -L../external/glew/lib/$(LIBPATH)
+    LFLAGS += -L/opt/vc/lib
+endif
+ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+    # add standard directories for GNU/Linux
+    ifeq ($(PLATFORM_OS),WINDOWS)
+        # external libraries to link with
+        # GLFW3
+            LFLAGS += -L../src/external/glfw3/lib/$(LIBPATH)
+        # OpenAL Soft
+            LFLAGS += -L../src/external/openal_soft/lib/$(LIBPATH)
     endif
 endif
 
@@ -114,20 +164,27 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     ifeq ($(PLATFORM_OS),LINUX)
         # libraries for Debian GNU/Linux desktop compiling
         # requires the following packages:
-        # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
-        LIBS = -lraylib -lglfw3 -lGLEW -lGL -lopenal -lm -pthread
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
+        LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -lpthread -ldl
         # on XWindow could require also below libraries, just uncomment
-        #LIBS += -lX11 -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
+        LIBS += -lX11 -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor
     else
     ifeq ($(PLATFORM_OS),OSX)
         # libraries for OS X 10.9 desktop compiling
         # requires the following packages:
-        # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev
-        LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa
+        # libglfw3-dev libopenal-dev libegl1-mesa-dev
+        LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAL -framework Cocoa
     else
         # libraries for Windows desktop compiling
         # NOTE: GLFW3 and OpenAL Soft libraries should be installed
-        LIBS = -lraylib -lglfw3 -lopengl32 -lopenal32 -lgdi32
+        LIBS = -lraylib -lglfw3 -lopengl32 -lgdi32
+        # if static OpenAL Soft required, define the corresponding libs
+        ifeq ($(SHARED_OPENAL),NO)
+            LIBS += -lopenal32 -lwinmm
+            CFLAGS += -Wl,-allow-multiple-definition
+        else
+            LIBS += -lopenal32dll
+        endif
     endif
     endif
 endif
@@ -138,7 +195,7 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
 endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
     # just adjust the correct path to libraylib.bc
-    LIBS = ../github/raylib/src/libraylib.bc
+    LIBS = ../../../release/html5/libraylib.bc
 endif
 
 # define additional parameters and flags for windows
@@ -168,6 +225,8 @@ EXAMPLES = \
     core_3d_picking \
     core_3d_camera_free \
     core_3d_camera_first_person \
+    core_2d_camera \
+    core_world_screen \
     shapes_logo_raylib \
     shapes_basic_shapes \
     shapes_colors_palette \
@@ -188,25 +247,28 @@ EXAMPLES = \
     text_format_text \
     text_font_select \
     text_writing_anim \
+    text_ttf_loading \
+    text_bmfont_unordered \
     models_geometric_shapes \
     models_box_collisions \
     models_billboard \
     models_obj_loading \
     models_heightmap \
     models_cubicmap \
+    models_ray_picking \
     shaders_model_shader \
     shaders_shapes_textures \
     shaders_custom_uniform \
     shaders_postprocessing \
-    shaders_basic_lighting \
     audio_sound_loading \
     audio_music_stream \
-    fix_dylib \
+    audio_module_playing \
+    audio_raw_stream \
 
 
-# typing 'make' will invoke the first target entry in the file,
+# typing 'make' will invoke the default target entry called 'all',
 # in this case, the 'default' target entry is raylib
-default: examples
+all: examples
 
 # compile all examples
 examples: $(EXAMPLES)
@@ -229,10 +291,10 @@ core_mouse_wheel: core_mouse_wheel.c
 
 # compile [core] example - gamepad input
 core_input_gamepad: core_input_gamepad.c
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+ifeq ($(PLATFORM), $(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_RPI))
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 else
-	@echo core_input_gamepad: Only supported on desktop platform
+	@echo core_input_gamepad: Example not supported on PLATFORM_ANDROID or PLATFORM_WEB
 endif
 
 # compile [core] example - generate random values
@@ -248,15 +310,15 @@ 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
+	@echo core_drop_files: Example not supported on PLATFORM_ANDROID or PLATFORM_WEB or PLATFORM_RPI
 endif
 
 # compile [core] example - storage values
 core_storage_values: core_storage_values.c
-ifeq ($(PLATFORM),PLATFORM_DESKTOP)
+ifeq ($(PLATFORM), $(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_RPI))
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 else
-	@echo core_storage_values: Only supported on desktop platform
+	@echo core_storage_values: Example not supported on PLATFORM_ANDROID or PLATFORM_WEB
 endif
 
 # compile [core] example - gestures detection
@@ -278,7 +340,19 @@ core_3d_camera_free: core_3d_camera_free.c
 # 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 [core] example - 2d camera
+core_2d_camera: core_2d_camera.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile [core] example - world screen
+core_world_screen: core_world_screen.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile [core] example - oculus rift
+#core_oculus_rift: core_oculus_rift.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)
@@ -359,6 +433,14 @@ text_font_select: text_font_select.c
 text_writing_anim: text_writing_anim.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
 
+# compile [text] example - text ttf loading
+text_ttf_loading: text_ttf_loading.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
+# compile [text] example - text bmfont unordered
+text_bmfont_unordered: text_bmfont_unordered.c
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
+
 # compile [models] example - basic geometric 3d shapes
 models_geometric_shapes: models_geometric_shapes.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS)
@@ -387,21 +469,25 @@ models_heightmap: models_heightmap.c
 models_cubicmap: models_cubicmap.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) --preload-file resources/cubicmap.png --preload-file resources/cubicmap_atlas.png
 
+# compile [models] example - model ray picking
+models_ray_picking: models_ray_picking.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) -s TOTAL_MEMORY=67108864 --preload-file resources/model/dwarf.obj --preload-file resources/model/dwarf_diffuse.png --preload-file resources/shaders/base.vs --preload-file resources/shaders/grayscale.fs
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) -s TOTAL_MEMORY=67108864 --preload-file resources/model/dwarf.obj --preload-file resources/model/dwarf_diffuse.png --preload-file resources/shaders/glsl100/base.vs --preload-file resources/shaders/glsl100/grayscale.fs
     
 # compile [shaders] example - shapes texture shader
 shaders_shapes_textures: shaders_shapes_textures.c
-	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) --preload-file resources/texture_formats/sonic.png --preload-file resources/shaders/shapes_base.vs --preload-file resources/shaders/shapes_grayscale.fs
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) --preload-file resources/texture_formats/sonic.png --preload-file resources/shaders/glsl100/shapes_base.vs --preload-file resources/shaders/glsl100/shapes_grayscale.fs
     
 # compile [shaders] example - custom uniform in shader
 shaders_custom_uniform: shaders_custom_uniform.c
-	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) -s TOTAL_MEMORY=67108864 --preload-file resources/model/dwarf.obj --preload-file resources/model/dwarf_diffuse.png --preload-file resources/shaders/base.vs --preload-file resources/shaders/swirl.fs
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) -s TOTAL_MEMORY=67108864 --preload-file resources/model/dwarf.obj --preload-file resources/model/dwarf_diffuse.png --preload-file resources/shaders/glsl100/base.vs --preload-file resources/shaders/glsl100/swirl.fs
     
 # compile [shaders] example - postprocessing shader
 shaders_postprocessing: shaders_postprocessing.c
-	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) -s TOTAL_MEMORY=67108864 --preload-file resources/model/dwarf.obj --preload-file resources/model/dwarf_diffuse.png --preload-file resources/shaders/base.vs --preload-file resources/shaders/bloom.fs
+	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) -s TOTAL_MEMORY=67108864 --preload-file resources/model/dwarf.obj --preload-file resources/model/dwarf_diffuse.png --preload-file resources/shaders/glsl100/base.vs --preload-file resources/shaders/glsl100/bloom.fs
 
 # compile [shaders] example - shaders_basic_lighting
 shaders_basic_lighting: shaders_basic_lighting.c

docs/examples/web/models_billboard.c

@@ -41,11 +41,9 @@ int main()
     //--------------------------------------------------------------------------------------
     InitWindow(screenWidth, screenHeight, "raylib [models] example - drawing billboards");
 
-    bill = LoadTexture("resources/billboard.png");     // Our texture billboard
+    bill = LoadTexture("resources/billboard.png");  // Our texture billboard
     
-    SetCameraMode(CAMERA_ORBITAL);      // Set an orbital camera mode
-    SetCameraPosition(camera.position); // Set internal camera position to match our camera position
-    SetCameraTarget(camera.target);     // Set internal camera target to match our camera target
+    SetCameraMode(camera, CAMERA_ORBITAL);          // Set an orbital camera mode
 
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);

docs/examples/web/models_cubicmap.c

@@ -53,8 +53,7 @@ int main()
 
     UnloadImage(image);     // Unload cubesmap image from RAM, already uploaded to VRAM
     
-    SetCameraMode(CAMERA_ORBITAL);      // Set an orbital camera mode
-    SetCameraPosition(camera.position); // Set internal camera position to match our custom camera position
+    SetCameraMode(camera, CAMERA_ORBITAL);              // Set an orbital camera mode
 
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);

docs/examples/web/models_heightmap.c

@@ -48,10 +48,9 @@ int main()
     map = LoadHeightmap(image, (Vector3){ 16, 8, 16 });     // Load heightmap model with defined size
     map.material.texDiffuse = texture;                      // Set map diffuse texture
 
-    UnloadImage(image);                 // Unload heightmap image from RAM, already uploaded to VRAM
+    UnloadImage(image);                         // Unload heightmap image from RAM, already uploaded to VRAM
     
-    SetCameraMode(CAMERA_ORBITAL);      // Set an orbital camera mode
-    SetCameraPosition(camera.position); // Set internal camera position to match our custom camera position
+    SetCameraMode(camera, CAMERA_ORBITAL);      // Set an orbital camera mode
 
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);

docs/examples/web/models_ray_picking.c

@@ -0,0 +1,197 @@
+/*******************************************************************************************
+*
+*   raylib [models] example - Ray picking in 3d mode, ground plane, triangle, mesh
+*
+*   This example has been created using raylib 1.7 (www.raylib.com)
+*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*
+*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
+*   Example contributed by Joel Davis (@joeld42)
+*
+********************************************************************************************/
+
+#include "raylib.h"
+#include "../src/raymath.h"
+
+#include <stdio.h>
+#include <float.h>
+
+
+int main()
+{
+    // Initialization
+    //--------------------------------------------------------------------------------------
+    int screenWidth = 800;
+    int screenHeight = 450;
+
+    InitWindow(screenWidth, screenHeight, "raylib [models] example - 3d ray picking");
+
+    // Define the camera to look into our 3d world
+    Camera camera;
+    camera.position = (Vector3){ 10.0f, 8.0f, 10.0f }; // Camera position
+    camera.target = (Vector3){ 0.0f, 2.3f, 0.0f };      // Camera looking at point
+    camera.up = (Vector3){ 0.0f, 1.6f, 0.0f };          // Camera up vector (rotation towards target)
+    camera.fovy = 45.0f;                                // Camera field-of-view Y
+
+    Vector3 cubePosition = { 0.0f, 1.0f, 0.0f };
+    Vector3 cubeSize = { 2.0f, 2.0f, 2.0f };
+    
+    Ray ray;        // Picking line ray
+    
+    Model tower = LoadModel("resources/model/lowpoly-tower.obj");           // Load OBJ model
+    Texture2D texture = LoadTexture("resources/model/lowpoly-tower.png");   // Load model texture
+    tower.material.texDiffuse = texture;                                    // Set model diffuse texture
+    
+    Vector3 towerPos = { 0.0f, 0.0f, 0.0f };                                // Set model position
+    BoundingBox towerBBox = CalculateBoundingBox( tower.mesh );    
+    bool hitMeshBBox = false;
+    bool hitTriangle = false;
+
+    // Test triangle
+    Vector3 ta = (Vector3){ -25.0, 0.5, 0.0 };    
+    Vector3 tb = (Vector3){ -4.0, 2.5, 1.0 };
+    Vector3 tc = (Vector3){ -8.0, 6.5, 0.0 };
+
+    Vector3 bary = { 0.0f, 0.0f, 0.0f }; 
+
+    SetCameraMode(camera, CAMERA_FREE); // Set a free camera mode
+
+    SetTargetFPS(60);                   // Set our game to run at 60 frames-per-second
+    //--------------------------------------------------------------------------------------
+    // Main game loop
+    while (!WindowShouldClose())        // Detect window close button or ESC key
+    {
+        // Update
+        //----------------------------------------------------------------------------------
+        UpdateCamera(&camera);          // Update camera
+        
+        // Display information about closest hit
+        RayHitInfo nearestHit;
+        char *hitObjectName = "None";
+        nearestHit.distance = FLT_MAX;
+        nearestHit.hit = false;
+        Color cursorColor = WHITE;
+
+        // Get ray and test against ground, triangle, and mesh
+        ray = GetMouseRay(GetMousePosition(), camera);
+        
+        // Check ray collision aginst ground plane
+        RayHitInfo groundHitInfo = GetCollisionRayGround(ray, 0.0f);
+        
+        if ((groundHitInfo.hit) && (groundHitInfo.distance < nearestHit.distance))
+        {
+            nearestHit = groundHitInfo;
+            cursorColor = GREEN;
+            hitObjectName = "Ground";
+        }
+
+        // Check ray collision against test triangle
+        RayHitInfo triHitInfo = GetCollisionRayTriangle(ray, ta, tb, tc);
+        
+        if ((triHitInfo.hit) && (triHitInfo.distance < nearestHit.distance)) 
+        {
+            nearestHit = triHitInfo;
+            cursorColor = PURPLE;
+            hitObjectName = "Triangle";
+
+            bary = Barycenter(nearestHit.hitPosition, ta, tb, tc);
+            hitTriangle = true;
+        } 
+        else hitTriangle = false;
+
+        RayHitInfo meshHitInfo;
+
+        // Check ray collision against bounding box first, before trying the full ray-mesh test
+        if (CheckCollisionRayBox(ray, towerBBox)) 
+        {
+            hitMeshBBox = true;
+            
+            // Check ray collision against mesh
+            meshHitInfo = GetCollisionRayMesh(ray, &tower.mesh);    
+            
+            if ((meshHitInfo.hit) && (meshHitInfo.distance < nearestHit.distance)) 
+            {
+                nearestHit = meshHitInfo;
+                cursorColor = ORANGE;
+                hitObjectName = "Mesh";
+            }
+            
+        } hitMeshBBox = false; 
+        //----------------------------------------------------------------------------------
+        
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            Begin3dMode(camera);
+
+                // Draw the tower
+                DrawModel(tower, towerPos, 1.0, WHITE);
+                
+                // Draw the test triangle
+                DrawLine3D(ta, tb, PURPLE);
+                DrawLine3D(tb, tc, PURPLE);
+                DrawLine3D(tc, ta, PURPLE);
+
+                // Draw the mesh bbox if we hit it
+                if (hitMeshBBox) DrawBoundingBox(towerBBox, LIME);
+
+                // If we hit something, draw the cursor at the hit point
+                if (nearestHit.hit) 
+                {
+                    DrawCube(nearestHit.hitPosition, 0.5, 0.5, 0.5, cursorColor);
+                    DrawCubeWires(nearestHit.hitPosition, 0.5, 0.5, 0.5, YELLOW);
+
+                    Vector3 normalEnd;
+                    normalEnd.x = nearestHit.hitPosition.x + nearestHit.hitNormal.x;
+                    normalEnd.y = nearestHit.hitPosition.y + nearestHit.hitNormal.y;
+                    normalEnd.z = nearestHit.hitPosition.z + nearestHit.hitNormal.z;
+                    
+                    DrawLine3D(nearestHit.hitPosition, normalEnd, YELLOW);
+                }
+
+                DrawRay(ray, MAROON);
+                
+                DrawGrid(100, 1.0f);
+
+            End3dMode();
+            
+            // Draw some debug GUI text
+            DrawText(FormatText("Hit Object: %s", hitObjectName), 10, 50, 10, BLACK);
+
+            if (nearestHit.hit) 
+            {
+                int ypos = 70;
+
+                DrawText(FormatText("Distance: %3.2f", nearestHit.distance), 10, ypos, 10, BLACK);
+                
+                DrawText(FormatText("Hit Pos: %3.2f %3.2f %3.2f", 
+                                    nearestHit.hitPosition.x, 
+                                    nearestHit.hitPosition.y, 
+                                    nearestHit.hitPosition.z), 10, ypos + 15, 10, BLACK);
+                                    
+                DrawText(FormatText("Hit Norm: %3.2f %3.2f %3.2f", 
+                                    nearestHit.hitNormal.x, 
+                                    nearestHit.hitNormal.y, 
+                                    nearestHit.hitNormal.z), 10, ypos + 30, 10, BLACK);
+
+                if (hitTriangle) DrawText(FormatText("Barycenter: %3.2f %3.2f %3.2f",  bary.x, bary.y, bary.z), 10, ypos + 45, 10, BLACK);
+            }
+
+            DrawText("Use Mouse to Move Camera", 10, 430, 10, GRAY);
+
+            DrawFPS(10, 10);
+
+        EndDrawing();
+        //----------------------------------------------------------------------------------
+    }
+
+    // De-Initialization
+    //--------------------------------------------------------------------------------------
+    CloseWindow();        // Close window and OpenGL context
+    //--------------------------------------------------------------------------------------
+
+    return 0;
+}

docs/examples/web/shaders_custom_uniform.c

@@ -75,9 +75,7 @@ int main()
     target = LoadRenderTexture(screenWidth, screenHeight);
     
     // Setup orbital camera
-    SetCameraMode(CAMERA_ORBITAL);          // Set an orbital camera mode
-    SetCameraPosition(camera.position);     // Set internal camera position to match our camera position
-    SetCameraTarget(camera.target);         // Set internal camera target to match our camera target
+    SetCameraMode(camera, CAMERA_ORBITAL);          // Set an orbital camera mode
 
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);

docs/examples/web/shaders_model_shader.c

@@ -57,13 +57,11 @@ int main()
     shader = LoadShader("resources/shaders/glsl100/base.vs", 
                         "resources/shaders/glsl100/grayscale.fs");   // Load model shader
 
-    dwarf.material.shader = shader;            // Set shader effect to 3d model
-    dwarf.material.texDiffuse = texture;       // Bind texture to model
+    dwarf.material.shader = shader;             // Set shader effect to 3d model
+    dwarf.material.texDiffuse = texture;        // Bind texture to model
 
     // Setup orbital camera
-    SetCameraMode(CAMERA_ORBITAL);          // Set an orbital camera mode
-    SetCameraPosition(camera.position);     // Set internal camera position to match our camera position
-    SetCameraTarget(camera.target);         // Set internal camera target to match our camera target
+    SetCameraMode(camera, CAMERA_ORBITAL);      // Set an orbital camera mode
 
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);

docs/examples/web/shaders_postprocessing.c

@@ -65,9 +65,7 @@ int main()
     target = LoadRenderTexture(screenWidth, screenHeight);
     
     // Setup orbital camera
-    SetCameraMode(CAMERA_ORBITAL);          // Set an orbital camera mode
-    SetCameraPosition(camera.position);     // Set internal camera position to match our camera position
-    SetCameraTarget(camera.target);         // Set internal camera target to match our camera target
+    SetCameraMode(camera, CAMERA_ORBITAL);          // Set an orbital camera mode
 
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);

docs/examples/web/text_bmfont_ttf.c

@@ -47,8 +47,8 @@ int main()
     fontBm = LoadSpriteFont("resources/fonts/bmfont.fnt");       // BMFont (AngelCode)
     fontTtf = LoadSpriteFont("resources/fonts/pixantiqua.ttf");  // TTF font
     
-    fontPosition.x = screenWidth/2 - MeasureTextEx(fontBm, msgBm, fontBm.size, 0).x/2;
-    fontPosition.y = screenHeight/2 - fontBm.size/2 - 80;
+    fontPosition.x = screenWidth/2 - MeasureTextEx(fontBm, msgBm, fontBm.baseSize, 0).x/2;
+    fontPosition.y = screenHeight/2 - fontBm.baseSize/2 - 80;
     
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);
@@ -90,8 +90,8 @@ void UpdateDrawFrame(void)
 
         ClearBackground(RAYWHITE);
 
-        DrawTextEx(fontBm, msgBm, fontPosition, fontBm.size, 0, MAROON);
-        DrawTextEx(fontTtf, msgTtf, (Vector2){ 75.0f, 240.0f }, fontTtf.size*0.8f, 2, LIME);
+        DrawTextEx(fontBm, msgBm, fontPosition, fontBm.baseSize, 0, MAROON);
+        DrawTextEx(fontTtf, msgTtf, (Vector2){ 75.0f, 240.0f }, fontTtf.baseSize*0.8f, 2, LIME);
 
     EndDrawing();
     //----------------------------------------------------------------------------------

docs/examples/web/text_bmfont_ttf.data

@@ -97,49 +97,7 @@ char id=123  x=191   y=141   width=14    height=45    xoffset=-1    yoffset=0
 char id=124  x=416   y=141   width=5     height=45    xoffset=2     yoffset=0     xadvance=9     page=0  chnl=15
 char id=125  x=207   y=141   width=13    height=45    xoffset=0     yoffset=0     xadvance=12    page=0  chnl=15
 char id=126  x=42    y=141   width=19    height=45    xoffset=1     yoffset=0     xadvance=21    page=0  chnl=15
-‰PNG
-
-
IHDR
Ε�Ξg IDATx�ν�M�fΗΉί#²αE{΅±6V+Β+Ϋj+„,μ0Έν…POβ…u�xF�Λ5‘Μδ•ο…€
�
ya'4γΰ�k/Lf/¬“Δ‹@�ΪΧw|u=
-Ήµp/�z?Y�·nWΧ[ΟSUηγύθσ�ΑΛLΏηΤ9§>ώυ<O=uαΡ£G!„b^<¶ξ!„bυH!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!�
;ΐ;ΐ£Μλ�Εη)7�ο?Z|–γ®ρύί»£\Νtμ�•³φZS®FΏωΨ� �cγΥ‹ψuΧ9†WO¬:V:oΝύ³�Wί:Ws/¬¶2e9­6eέ§>νΞΦ_οUΫbφeγ�ήύπκi�w­­ΟΨ+OK™Ζ:_�:�Γ«Gc�#¦t]c�#¥φψ�®~ΤPΣχy―1Ζ‰βΈυpΌoΰ	ΰ#™χ?α�τσ,W€]ΰ9γϋo�γ­›»ΐο€K™Ο®S~P;ΐ«Ρί?ξ�VΊυσ$ωΏCWZ9Ύ�_Ύk�3π=ςΟΰψ*muξYΰ™Βw�Y|―…‡‹²��_^6>»
-8Ηώ:γΤ³}ΰϋ…ο�_n47tκo�=S‹λΤ,?q>{�Ί
βEη³·θκ§G,hΌηΓβσΦ�eΘωφ€?8_GΧ+Ξ1Tά΄\tmεwτ»¶0X[ύ|Μm¦o)ιΪΖaγυƒΐ©ΰ·Ζη�O%οyƒ9δEΓS‹cε°Ξ½	ά¤\ω.?Β~Hί¤k‡ΐ·Η)ΪΖ`
|΅«}xΌζ|ΎΌ`|¶\v~Ϋg`|�bρωσ�ΗeQ–:�…εΊ•�Κ”{ΐ�eIΩ¥«Ϋήµ�_Άώ�†�=nWΧ€™ΧGιΪ�,^ηώ+lαx	ψl΅l^ίvόΆπϋ»”�ΕmϊYVuΎ«‹ίΤr@�ArΘuAWΞΛQ�!{‚Ζβ€i¬)—θκu«(M€S
πς³�‹t3Ό�Οβ«�\C{ϋaώ¦PΖu±KΧωΖάΆλ��ζlGcΝΤ�cΌNy±mδκ”λI‰;t™ΕwΘ�ίΕ®k}ΖKFΞϊUΓ·9θR.Ρ)ω�8•)'tυl(;ΐOρ�aλΰ•Σ�=X
.`?“cΰ3�·±EΐCΰΗΞω½Ω=ψuφ
φuQΝLΥcψ%ε:΄κσν�µ·V.ΣnΖΎΛπλ‚nPχΔβ.έΐ:¤��½CΙυ
7©kAΌG§Κs|�πw�΄΅YΏ9Ά{›HΪΔ3€‡t®‹�\η�rt�±fe›H®c­©'%^Α�Ρ¥�"¶¶¤-�ΧJ�ω?ΠΗ
έ@η
Ϊ—9νHK�ρ.¦Ί�ΝΊ—Πoζ\	‡ΐΗΏΝΕW¤wA~{`±&3PvxuΦs/xυ®•=ΰ�ΒwήXρω,ξ!�8»@'ζ�ϋήj«±Έ¶�›$�ζρJφθ��ΤΤΈ°�-AόψΐψN<°ΥΞ†RΏ°3πΑβά›HΪ|H'”©λ"u}μ_[ό¬YΩ¦’>οΎώ�”’+ΰ2gΖΤbσύbM^%oQψΫΜ{ρMσ�Ε#>n,*SΖr1½Ay€iq¥Δ–™Cΰ‹tƒϊU:³~z®Ϋΐη¬0Έ
-Ό΄ψ½ςkΰ]£9—f\F«Ξz•Έ�η�-α•,c°g―%ΧΨηΫ‚[4οΣYIϊRjΏpj�
―Τ›bΉ}JζρτΖ¨97�Η=ς.―[ΞoΌΊάj51gΰ�.ΐ%G<°ΥΞ†β™Πy1tΑ‡©Iά‹ΈΞUR+�Ρ
-�°Ά�Η^�h�•Υ\—u-9�W.ΊΉO¤ιΛ�!�ωζό�ΰwB¥�1�Άοk}±|Β'ΐ&=µΑf9<‹Η
πηΨ�δ	π
†»�jfaΧh»�a†—1
.q΅S�Η�
-ƒNϋ� ¤­8―/σf¤^ίζ*[Ίλψ4Λm�>�ΔT,wΕ�ΟηO’¬~ΎΦΕλ	Ϋ#Ίz‘™>>IϋuyΧ[§©*ΕΦmΑsZάd@ΌD�ΐzP±ςπ|ω1qCσ‚Αrf5Ο�3ΡY~;KύYΧ�6ςτ~¤
-,µjΔΦ�Xaφ5={‘d=ψλ�¨!‘σ	…HΣΦε[ι+�Θ=“��νf*α
�{ΐ�Β΄†ά«n½ό'ς3Ν�`3‹’Εγ[Fy`Σ�UΚζΓΦΑ?�Ω…2¦±·ΆcζξAl}ϋ9§�¤Υ‘�»ΎXqV §g½+D{V§c:1Τβ®XυωVpεΧθ„�ε2:¤{^%JΓ–λJ­W’ο—==mυCcYή†Nχ"οSlQ‰a€΄όGAΥη°*\®ρz~»Zυ—kδibQ“«Da‰P΅ύcΖ]ζψ8π_)›hχθ:Β�@—RΐLΚ›,Χ•ψΎζ�Ι�i8~Ji`όϋΞg}M�`Χχ·€ΏΑ�iφ™MJΑ�9Ζθ€ώ)εΐ΅ΦΑNETC1ζΚ�¶½X\ΗΛ–­%¨Ή�@.NΓ€ή¥s+δπV7Υ~�»"'$W}Ύ€\&97N‹EΚ³ΎΤΔ‰έ§»/(/Eυξ΅χ¬αl½�W®|†α–·RΠmκ‚φ8
ώΦ„Xx•γSΨΚι�nv—¥¥¬½²pκg/)ΗTΥZf�άƒΟUϊ°&9υµΡ
¶0ύ²Ώ‹Τ«Δ?΅ή'Τ2hε‚FCg�{&c{φ‡^zζ�0�Y
gCάΰ[<rεΓτ@a~·±ψ85kλSWa�Ώ±ς”€΄—sx�W>Ο"�so¦x9X`YH―ϊ|1-ζiΛaα]ΧΨqbCοαό•+5ΔωΒ+'Άbjσε\£8Uχ>^εψ¶rzψ�™χƒΆμ�kΐ©J-Ε$Τ~ίjδ7(:qb™m^φΧ2hεZ�YYώ�1qΛΐ8Τυbω$cαj‰ζ΅>Α’Ε#ζ
«K,U
-K‰whc©°�ρ§
·5Ώρr¤–DΟόο­ύχΜΪό&-yPΖXYΣ7οJΙ…Έ|�ρ¬�ΉAΉ&c�η4Ζ=\5¥Ύ,ΔH4“t/«r<	όs–Ih –ϋΰsΨ
€%εo5ΰψ
Φ$h‰g9υWjδW°£MoqVmΕ�hιμ3—rHΰa0A•"Tγ�V/jΦ‹2Ν‘Φ•ΰ*ΚωΝkfy5΄�CL��e)Vβ^ΐYί�­xΛΣ¦ΐ[Z•‹Α0hΗυΓr¦“�>ΉBΌ�i�²υ¬°=Y;§L¨�k‚ΝϊΤΗM”71)έ]›±ϊ²\©°L�Ο�²
-³!k&t€=C/5jΛ
:ΦΪ¥fρΜ6gΒ,ω}BY>Ζς²�Ψί/Ο‰c
-B¤~.Έ*¤―lΝ�‹‹’2�ƒΓZΠΉΊς"ωΖ<f²§;ψΛe`xΞΟ²”vp^›ι“Ϊ―΄ΘcΠbέΘY
γϊQγΧτb…JΤ$8k
R®ΕK—>S�ο.mγ,|ρ*%Οr΄)ΙΰVύΜJάb\kΚ©°Y~η0²fBO`›Φju®
Ώ_®“Ξ-QnΛ�?Φμ4^�έ�T�Π	¥–Hό¥:UγΚΥ•O�$yo�dO^”χ9<ΛRΘ^Φ¬¨oj`hKR��%lBτχP,ΧPl©Λ‰„ "J®%/®)L¬•5υv�¶Υ2θL}Ύτψ}σ\§q;
-ν¦5}®θΩ—΅χπ*«ΩΠm%iγS
ΰ%ΚΠ-7¶fΦ
g—όΒ€�λ¤ί&ίωΏH^0Τδχ®!]φS?rμ«Ig±-Ι$6A1[qι=ήδdO9ΖJbύάU9ΌZ}σ%®α'�©Ω�	ό£±¥.­?ρσ)‰wΟE,ƒV`cMΠ•εϊ„ε�+7φr¤ΐr;o9_��ωbΌGΑύθΥ‘ςVΟά3σ®ΛτμΓΠ{ψ"§«ϊζR	‰€<—μπ{»‰Tx
&%�Ε{A7)5Ρ–^y>GΎ“ώ‰Q�ηΏIΓΖI›�[φ—HβN%5OY?Ύ.j,cYXVEKκίή¦E9ϊζ\‡ρ\
a©_)³[λµΥϊyΣA*ν+Βσ©ο–µθέ@l­τ¨±"y'½?±…0lΔ³OΫς·–σεhYngYΑβε†χιΆύ[s�yΏuybΞ%[ΚvπξaΙm—[Δ@���J»�–6�L* ~v™Ξβ½µ·)-&μ�οOY^2*p®—θ’¨¤�@e-ϋΛωγλΞUΔM	†©ΕΛ»ΨkE^¦µ>΄,�σL�Gt)t[φFh%NΘέ θ=ί’θ�Ϋb0=—κC:H¥}Ex>¨ο^Ώd%V�µP–ϊΌW9�WJΏ·όμΊ–³@Τ�/Gi£¬τ|–« d5ΩψVN”�ΔsΜ8ο–Ry{ν³οD§$΄'uρε€g"‰Ι]pΝΐήjvχΤaL\�kφ1|ΣΫΌμoJ&ήMήμ)G)ΣZj—W–L�―ΡΝ4Ό Ξ!®€[,'Q£s
-}BΈ±….7γJX,‚OΊu‰g«ΠoιΜ=‘ΜΈΟ�¥q.ε{�±Κ\sΎΤlΌΏxί[g^{�rυ9¤Κ-]›;βΕυ„`ι\�T)+jοζ¶ω
η°ΪηPWriyσe&rδ@ν€›Sς53Β–�FPο–�+p�;Ά6±‚‡·μ/O«κ\„τ¶Ν–K3’mσ�έΒ8Gν>τ�ι?®[}¶IBΙ
-pΏs
-}BΈρςΌ4–ΐ:»KηS�σnΤ�β�lνΜοΣύZΔώβGΤνΤζ­bi=_Νς½άω¬Ι�µ?}x>΅lΉUO¥­�α4[K�¥{Έ·8nν90Μ•\Ίφ!›�Ήδ@)[Ψ3»ρΠgP(	‹΄<5ξ�΅ζkΩ_ '\bυ�ϊΨ¶m¶π¬>Ϋζ�χΜυqκΟάλZΟγ‚oZΜΥ-oPΫdX²”γίu�U.ξlΓο΄ΆΗΓΜΏ%Γ\ fp	<θqό>›ΈXΤX7Ζ<ί!έ.‹)53ςx n	\= /j―µbΉsΖΊ‡Φύk¥T�ΛL`Θ	(›ς­Ωs�xθ3(”:΅\yΌ
~θ`›ϊΣ¬�X�F7�T-�½gΐ�πΔΩ6Y4<σM}ρ\g—±oΙτ�«[¥ΜΨ«J&Κ��θαχaοyΛdφ—�G�νC2«!kΆk¬“ΠobPΪ-®…�ά Ηtρ C°xkζ”1s†¤άby“�ΐΖΉ�΅ΞXyϊΗΈ‡Gΐ—�γ·βm‚υ+o�°@©±x΅Τ€ϊ
-ήqs�yfΏ΅ƒmΌ™‰Ω
-ε(Οΐ=Κ›Xl*Vΐ¶Y4ΌνHkάE�υΛΚ	P2ύ{u«4c;p�4ƒφ–±ΖƒI<ϋ»ΑY+Jθ¬Γ€ήΩ6ƒ/6Μ:["―k¬“Cλμκ£ΡK„|ρ–�χΘ³<y\£Ό‰Νϊ_�µT°¦―»B�λ
-η®Ι‡_»�cμ”Η�_φΣΊς¦�%Όΰ®’�Μx‡dυ²�k5Z+§ΑΠ€�΄Σ.¥�
;Uε*YΘ`©αmΐr·l“�Ώ΄φΏfVX�UIs”v�‚aΫ»^Z¬ƒg®9_�Αρ€φ4Ψ79λ‹½EΫ.l5±DcΔΕ;Σ•f²΅ύ[ιΌkvψ»Γ©P*�/XXZrΖ‡λ)¥‡Συνρργώ―Ε\ήr]pvΰΦ, A�zλςΣσLΡgΧμ·0j�Ο…G��u,!„(q•³©eO€/‘�­εφ™χΎΏνΔχζ<_§Ψ$„λΰ.νsKΟ#ΑE²Ν–A±H!ΦΙ>π3μejχΠ@(Δ$H!„3Δ
-B!Δ9F@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!BΜ�»ΐ£ΕΏB�™"
 „BΜ� φ�ιfcΌή
vΆσάtΎ{³PFο·ρζκ�ε�_Wεcq­ο4ή“>Χ[ΊWήs�;Υσ�{Χω^ΝλχΐnΟrx―χiIλpz�k.έ£�ψy,ή;�ή+=χuQ�Gc—ΫκGj¬%Cϊ Ϊώ
Κχ¤¦Ο²(�5Η¶�±Ιmο<‘�Gf‘`΅Ά�
Ψ+|woρ½!�ΰk~»m\~Ηψfκ‹ΐ›ο(§ΰΕδο€?FΆπyJά8ίΈΞf	�0ΘΥ–{�z²|ΐο?5B<jοΙmΪλwθΛή¤k#ή±5�oΏ±>�θΟUΚ�%G€ϊ>�οR?S80�―ϊ6›3ΰνO&ο½W~�;ή/)Σ”λ¬76 �–� —r@Ϋ,:eψνν9&hcΡχ�ΤΦοΦΎlH&¦ηxρ�“θ�KHτcθL�Εοϋ¨θ=ΰ›Ο½m\fΊΗu6£#ϋπDςήo>Oω&νƒΰ€υέ“7θ_ξΎmcψ)�Υ©/9�6C�eΙj8¤/λΫ‡‰ρ	ξΑΰόνβύ�χ8µπ�±ήHτγU†ΝXόώω�Ώ�“+†έ«ΎC½/}*��ώN•ϋg9;@yΚ~ψΚΐςΌΚκ-M»ΐsΖgχ€‹ΧG�Cγ{_΅ύYΎA�
6�hc°OΧήsάβτ�\3ΎSj;V_v<½8φΣ‹ΏsΗ~Υ9¶X
;ΐη�®Σλ‹Ώ/Ε©…ηL}ΰ>]ηs΅βυΊΞΗβψ2¶ir*ξΠ―ΜqEΟ½ξ$ίχ:©“ΕΉβίίsΚόyϊu²Ϋξ
-�;®π²:™>ΔƒEiΐ€®ΡΌ<�Ήϋς$g;β ά©9ύ<&�PΧC�ΌGχ,r<<λ”w•
―Dίΐο‡jΉI»i=G*ΰi]΄^�!ίg>O~€>Ύύύsμ:nΉ&ΌΎμ5ΰαβ�ηx�υ‹ηΉσ,]{ΝρΛυηοκC«`ψYζ€�#ΊΞη΅ρωyη‡tb*ζ%μ†ωέΜ΅ηΝπψ±σΉgξ.qLΧΑZƒΤ‹±R”t�Ο5w�ΫΙw‚’�_7>o	Θz›ε¶ωmΞΦΟ ΞgΉ.[”Άί[V+Τςέµα*Λχµ/©€ό6σ^7ΘΟςΣψ�Ψο[‹'•Όχ+ςύq:ρΣ—�j�Ϊx―]Φ¶ku…W­ςΧΔ£Τ®)Ήγβ	Όe	‚Σ¶}%ΌΡ"4ψ—Ι™ζΓΰ“SύcΨύ:O®Οl�λ�ϊπl+CiΖk)XjΜ¨τ±9 λ�Aτ^Z?o4/ά“TΌ¤Τ�•‡t"%χϋοE{>ϋ�ΘΙaωΎ�‚~–¨ά
-€ΰδ–>‘τ±•3}Nήlώ'ΖϋΦ�…άκ’?.ήOβ�+	°kDƒ•s�R»¬]ωcέ'KδΔ¦χ”Χ±­ΰµν&Π²�Γ²έ"Σ¶k@iπ?
ΎΚ<«“‚³mλ^§p„
Μz�1cΚ�γwΨAX±9r¥ggqέ¥Ύ±†F¥Α�­Aw�cψ�ϋά“�θρWΘ—=ΞY`-»M]VΔ�-–]~µδΜμαzs.†πΩΦO�
-9,Χΐϋ,^�…΅Οκ‡]ΊΨ‹k”�ΕMΪλΰmlqn
�–Θ±Lοή„¥O™¥ ΛtεΟ_rΪ–²ΑΞ5 fπ�υζΒσΐλΤωSA0Ε€pή\
1Αgέ·SΞα™ds3Ά!>β=Ί³Uγ	��0¨¶BCύζ^ΠεCΰ“ψ19Ώ+	Ek°ΌG›υ#=fί—θ‚΄ϊLΒL�DcΖc
ugJ«.j�!ξ›ς®Ίc:ΧJ��‹Π�Οψ1ωz848ΧΊL�ΰίs¶ΈM"J ΄6v�ƒ?tΧϋυΏΙ€ϊ¨ώς&88_®€�΅ώΕ΅x
φ�.Έ0�d­ψ‚Λ,?›4θ6ύm��~�ΫςΥΏDύ Η”\^Tzkί¦&ύ”>υµρ4o°<X�έ―Ύ]
0…%οΎ‹Ρ-­ύ“΄•ύ
μU5ƒΏg=�ΫN�Υ"–›0uZζ�ΰφΙaΕ\ΐr`΄Υ�xA—��ΣφβΡb‹Ϊ=’{λ	€]:3†UΰΉώ�;τ�\ο«ϊ_Α6Qmσ�‹`AY•)=5eΎ�mVύ"ggV7Θ―ψ¨Y*•�7υc§�ηL΄)Α·ο­BΙβ¬ΊiΝzrύA*”cαbωv―⻃,jΪTΞrqB·Ά`Θ,ΩZ
g;vo@Ϊ^h<―—y0Xw6%ΡUΰ[ΨΦ£�Αμv™Ζ΅ΣY@r}΄µςΗ²�¥.ΒΘ‹�ΨcbΓπι�θDDN<[“Άcΰ?ώ���Σΰκl<…%Jƒ?t
{®ƒΰ!�Κ.-3Λq‘ΞΊ�b	π–?ν
�¦±ΫΒ�LιιΜΗςmZψ¬ "o†”›‰ΕεΘwµΜΠ®P�Nρκ¦uOή~�y?ξτ¬¥n�Ϊ™�·.έ*·e2£Λ-£ΎGwΟc·‚7 Αr*θ1°2;φY50”‹ΐη�Οά�u	VΜ€zξ0kε�εβ}Ρψ�Υ¤Δ«;�vq“~YfYηΞή‡Β*'j�Z¥6�HκZAΠgύω}:σN�Ο1<AΡ*Θε
πΜ^0m6ΐ�‰Τ
-”΄‚{RσtΌd)ηΏ���›
Η�Χ�Ζq�U W7½{β¥%®¥vfχpρwνΜΞ�ψτWβ�qlo@j5¥Ηƒ�χ\[3;¶υΥX¤JΤ&κγΊ°ή·άFΏ¦΄)Αόn­Έπ.-rΙ�µ4µH*jRb�=ψO•?{�Δ‚ $ϊ$JΧn�‰58Χ�C±Μθ0^6@―Ύ•RοΞ�Ύ‰�ϊ2ΦΜ.=�µFΏe5Κ�;'�L—ςvΏ�›±¶–cκΎΊF¨τi—­9D¬`ΐKtΒΣςε{K�bβά
5ΙMF,j6ι;ψ{ ¤z½J7UC²π¶ύµϋΖΜZ6ε17…)�i)‹cl‚΄Φ=χaΑ�»tu�K(²ΤYξ�!‰�ZsfΧ:“>/xQμ-χ¤υώ�ΩfK)¨ϋ΄Λ>»4ZΑ€�"/¦jr•„ρΓ›α‡@ΪRΖέQ fπb.{ϋbΌΰ—}:Σo/Ϊr*<ΏYP‡«Βsl3SΞ2,3ψ©uSJV’τΥ’Uo(aΰΟΝd-Ώ¥—7 λΉΕξoυK�uζ›d=Μeu³f³-λο!?ρ#ΈΟ
-4Λ	?O<χΙ�i%\*-k³�xΫi[¦A~L²–ώΕX›:Ερ-«μ+x�ϊΑΏοY°}*�¥υ‰”·¨΄‚�¦ΖS»·Yn�¥¥”C|§SΊΦΑXyΩ­c{Κ;53·®	n!�εάC±ΈΘ»]ΓήΙΪZω{δ…QΪAzχδ2ωX„xΥ@Όά0'¬¶•[ϊδ
Hcψ¤k	ƒs.ώ#7›mΙΨ��3ηκ —™.ΧΟXι”s“™–΄Α%®
�νΒ)mθ4V=)υ½Ή`ΐ\nύ�Ι¨χlrβΑZm3*�Q·Υd);\)Νε1έΝτιK
U�1‚�ϊ॓…ε{ε-ijΕΨVW€U�J¦±Ϊ{ϋkk�me�³fH{tΆ9ξ€½ΌήΦl-—I,�M¥ΛΛj"¥Kmν€S‘ξ“%ΊrmΜΊ'Ή|Otε:=k&y‰n�	Η.*ΧFb��wΏΣz��±―tμ7ΆΏ½‰�ΥvΌύ7β¬sήκ�ΪΤΛ�Ψ�lEΫ—‚£­>8­'ήύ>βt©�Eiβx@yΦξΕ.¤bξ.+
-\εvΐwh_“l‘[7Ή*J›Φ΄�Ϋ<¨•σκ
-Hyΐt¦1+Υ°woCR§’`υκj�–Ξ¦J;Zx;ΓΥb•Ϋ»'¥
�Vηλ•;>¶'�—’�ΰο�Ύ¬%†ρ®~©5ΤλΫβzβ|Y
dή±k�#ƒίv¬Α4ΞbjέοΚ»τϋ±€½Ώ([/Ή™·;a\OΌ{Rc²χ,^�Ϊ{ΰYζ�Ύd*+θ«Π–�Μ"—„eΥxΡκµI=�rή\
)µ9ήϋP�mς¬K©XΣΰ¤Τδ�ϊμ=�eLi½y‰RΉ‡άoί�1Κ=U=)aνaPC©ΎD�φ]Ί'ι�G+βΛ
-PZx‡ώ+’Z\Ϊ%‹o­+ΊΖ
-^ƒ·gI3«5Ϋ²zά£�LdU\΅�uΤμrΥΒ¶Ίj�j—Ιm[Σ\΅}ΐ«ΙMοeψΛEΕ·Έ½B’�)Κ
ύκ�πiόAΓ[γ_:φ:w#ν{ΏΣdA9ϊfu¬}–χι²8¶τ5ε®Α³\ΖΟqqƒ¶WΠ^ξ�ΎµK� ή
-‚­οφYΥ�eΥ XΤ¦�
�Oc�cΠrq¤ηΙGΞ›+ ¤�ΊerJ0ε¶FΫ†�z¥A/Ώ&λ�—α/η3μm][ξpΏ[v¨�¥NΈυY¶dΨχ{μz�—Ϊϋϊ΄–Ύ »4�ΤΦΑ��ZZ~Φ§ά%<+@)[jpοxε�χ¨θSn«|} ―`�΅�΅.[±,£εηΈπθΡ£1�#„Ψξ�ωο±yΆZ±"Φe
B!Δ‘B!f�\B!Δ‘@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„'γΐάBIDATb†H!„3D@!„�!B!Δ‘B!f�€B1Cζ$φ��GΙλΓΕg­ίƒΰ�ΜΉΒλnΕ1ξ:Ώ/½nφ(sι|ο,®k�ς¦―«ε½ιόώχΐnΝEWrΥ9WιΎZg½6VΣfVΕ*ϋΪ)Θυίµ}�χ�[^ρ‘φ?ΕρcN`“ηΐ�σ½¦<®SΧ)Δύ πέ=Ίλ{pm%t‚Χ�ο\~ΗϊΛ*΄ΥΩm$Ο3/°ά_^^CY~FP�δI¬�]ΰ―ρώ”½Εo¦¤nc‹€ΰ—΄•Ί†π+V?°±R*1λ*«��«l�Υ¥O�½ΌΙfΝθηΔπ�ρΩWXO_rΌ•Όχ5΅(
°Zv€��
8­\Zόv�νUγΨί¤}πL]ζoΠ―Ό—€ο�[±f‚5jΣLί)CΪΨχY―%`—Ξ‚6¥kmΙΝώλ΄ό8‰ώΎ|£–X-^¥Ή\XΌ®ίΩ[c
-rΗή¥S³9�€§ιΚϋQΞ��b�
�£€\Ε�EΕχχ�ρ�ΛΘ¬z^ΉΝfΖbxm¬†‹ΐσ#•EΤαΝώ«°�―'οέ$ο™γ†ΐjyΡx�p'ϊϋ¶°fκ9βAοπΞ�Γ”O%–Όµβψ*πpρχ1πe:Q���A¥ε-½β{ζ5ΚτώΎ’)λ	π―€�WYV±�«ΐ¦ψΠ_Ζ¶ήβ΄®?MΎ}
|�Ν5η�άDξo“ΏKV€ΤχsΦ„ελt~ΚO2οeΗ�Ηπ#—s¦³Rδzό}+Υ3Yε©QξΉσ�­ψ­λ/E\ξOfή?΅3Ϋ¤¤
�!3κϋt•ΖβΙί© Όό:yο�ΐ=Λ5Ο�έ›”άύ}|�³�μqΰ/�Ώ™°�9Sj\­zW3�ΥD—V„XΫ¥ςΥ¬dI)µγάη­zπ΅·”±tΌοX.�΄ΝξΡ
�‡ΐ�+Λy�°Ϊ…u?[VτY…�›h
��e�6†ΰ&y«ζ5ΞNjbήgyΆ—µ<¶8Θ-§©rπόUιLλυLA SG�5�aΝ’ίΆ›iζΆ!w£‚β�–ρΫΎ…Ή"φ­�ωΰ‰Κp‘Ό�¨%W9,n�W�ο³ό,ΖΊΎΎ<IwoR>ή[qYZΉIΩ�›	†ϊϋ��Η-E•Β��>KC―ΡΏ]Δ„ΩkΗµεϋφ�9%”q�ο: 7ΙΧΓΫδ…Ζς–ΉtηΉ
-ΌΎq›Ή‹έ.¬ϋ95ΉΩ�ΫtΟ=hCc
φι‚ψRξaώΠMΞήΝΌΏ4¶ΐ·±}Έ±rπ*ααβ85�όμrx.σΎ5K†®cΉm|σ9ς
³–‹‹c”°"κΗ�![3σ�§ν>\aΩ$u%σ=Λ]π›Κs?mΝ+½ΗΦ=ω€ξή[3‰>ή�ά¤n€ώSΪΕj�›r�¶€Ή=ό	D ¬¶ό�rέΌN]΄|lε±άi)a‰]k½ΈHΧ)—��µ,λ>�ΚroνEΎ}
?h(λ6¬3¥η\\ζ62–›1�µ4ϊ»gvθ‚χ�φpDηΒτ8¦›¤¥<G"pƒπ|ΈΠΝ>vιΆ¤-�π7XV΅Ήe	�ά�±‘�Ι™E™ϊΜ�¦&ά―λ΅X>rΛ¤
¶Ω°ΔUόAα·=�»OΧΑη8¤sgL�uOή§³ZY3‰λ¬Οl)ό©�{�Σ
ΖάΜΥί΅xΡΘVg7w(_sJ‹Eδμ¶��: άΔ¶*¤±8Sb	θ\»�…ΤΤ«V��›ύΗύ[nΒΫ7pΫ²΄ΏFέσΞΕ
,Yήγ ΐ‡‹ƒηΈD·Όκ²ρΉ��:Ν	‹�/Ϋ2�ΏNήΔεΝ:γΞ®f†RK�cgX.k€½ΞΩ�¦v6T"�Q{–ΟΚβq»ƒϋΩ­�Κ3α‹tχ{Υ"ΐ³ΖΔυ¬µώZξ�ΈSHE�	�)ϊέΜΉuP©iVό�'vΗlΗΗΐg¨���Ϊ�ΰR°κξπiμ~w.<Aη~�kφ»_�Y�Κ‡¶ΐm°-ν-“)ΛΥ{ΖR�®Έƒέx-zΙρ�ΞG’’Ξ|-σ��?/‡%R3‰εΛn%
Μy	{F‘+›%†ΰtΖρ@��΄w&7ρEE©nl�±ΪυΛ–Υ"u§�USχTl&�ώƒIm»°¬]–��ΓY³ϋX„°�¥Ε�`ρ¶KαύDΪ¶Qs?�ZAYr³�ά¤){�j°V†�1™:Σηδ–
ζ–HYΤψ#ΐ�Ν7OΡ=Μ”·ΙWt+�ήϊMΞ$�JzΟΕρ$Λ�ο!�Ιn3�Ϊη(ΝN λ¤r±λ �έzώ”	<�ΐI―ώζ‚ΊZκ―θ™‹³κΙµ‹�»–M¶;‹χrLΥ�αlx�X‰”XμZ3ΑZφ±­­·Ψ�v5%cήΟ΅X³�,‹fkΒ[λV³f�ήD8Η{tυ;εΜΈ”-ƒT­?Β
-�Ν7ΉY@.ΡA
9S{Kτ{�μN-‡e�Ί|©Ά,·o¶γqD箨�MΤ¤2ξΫIΕί� DκΆΊ�-VεSl]5ΡRsΙ@<ϊ,‰XνΒrwµ�lΗnΗρRΕ±­l©0RNΛ…“΄>―�y?‡»�JΑΠ��®µΨX³�WώΎ‰!‰€ZDKΑ_Ή5°‚�`ύΛΞµξ1Αό�„B†½ocΟϋλεΞΣbJτΆ‘αt¦}Γψ|J¬{bωΝr»ΰPιΊαMN/ϋύΜΠ�“;£¶]¬Ά‡eΒ¥Ν·bBμAM]n�”°V΄¬sΉ_.w†• (ΞΪgϋ~nΦ8Ψ7>«HNΤFδΊ9†3Xλr_Δς*όΊΟ†,ΙΛeƒ
-�Δλk;WoFέκC,&g}AI}„X
q��¬±¥.΄Φ_kVhf-}‚έΖH9=¤]�Aµ^³LΞΊ�Φif·²Δ­CX�gZΫΤΤXγ 7DN΄lL±·ψ~
V&«η€?#oώο«zrΑUC¶•€Η
-δ
-λΟϋbΕD¬C—�[tƒΝ:£ύ-ak”pϊά<a‘rήςΜΤBΡβ';ΰµDΊΖάK)Ϋη|­‰©�ϋλ	΅!νΨ[!”fϋC!Εf“«§λ©)V0μd–�TτY—μn7��3»^ώ$σέψ�Ρΐ[Jx@�Τ;†µr
μ‡V»{–U&Sƒ»tΡρV§{�Ν�™Xq&Φ’Lλώ¦Αz^FΉΈξ{�[�V@Ϋ]xΐΫδΘ#MΟ{“eS®‘bµHΫ…Ψ—ή_OεΚ0F;Ω¦ΥY)ΤΗΘ|W›lkSφJ“x9^)'Κ:°&}¬›ΦςLϋ‹€gϊ?ώ!φ��ZW€—0¥&ΪΧςγ¦[»Zω”[I3OY‰‘ �Π®b'Ξψ^ς=«r®z]½w�PΧ΅Τv\-™Σ$-^¤pΊόΝ»Ώi½³Άzαlπ�η°"x­ύΰ4=m‹	Ξ
-ΜΤη�³,XKSsι�-�vρ¶1Χ®k…Πνψ�nYYk ©Ψ¬θw8»=tK›Z^ά1-Ύg,‘±πL�―
�»ƒ­uΤ.η¨]ςΰ	�ΈSιΕλυ­ΞΘ
-<σς,Τtψ«^W_�Υnήύ�Ε…u­ηf-c­ΕZ-sL—AsΜθfoΣ�t@…Όΐλ³ϊ¦¦]XνΪ³²�Υ�Γlέ®*1-›Φ�5cο»—IΞU¶δVΐ3ύΗƒ�7c©uΤl�Q»δa�t(VZδ@K�…�CΊΘξU�Ίoΐ&ΠχώΡeΖΛ=·ϋΐ{–§$ΪJ;4BW¶?£Ύ�{{{Δ�5X?`_Έ%„Ό,¤CΠlzr«Φ™¤¨%gΐ»Τ[¤§Ζ�mιK–‹oX�Q6ύΗ	bΌ›[λ
-(mkΩόWΣ�B7²®ώ�Ί�—Ίλ�$mK΄ξ±ϊ™‹ηΗέdϊάί�\7¨ίT&P›!δ�ΟΥΟ[΄w¨Ηΐι·°5‡Γ	π?+Ύηm_Κβ³�ϋϋ
uBθ�νΟΟ8¤Ώ›2y΄[\q
«ο^J¬υΎΏ.§Ψ=+@ΞΔ�ΓςέCΏ 7―
³€1f·±ΣR†Hβ�σ„%Z¥�μ�_}AJ›’g΅qβ―#u£v€
υ¬4Psskpd.�HίΛΪ{θ[f€Ώ`�vQΣ��e�ς‰ωam³–zn�8μ»Α[�\ί�uλ]xτθΡ�η­Ζ[Vv‹Ν�*bjβ-{K©“­m―[39φΕj³'t™-Wµ|nSΚ!Δ¦’λ+鬂gDΟ�L€}ρ–•�Η½­…¨!φΝ§ΛB½m―‡ζ›B�/�¥²f\ΪΤ ]‡lν�$ί±�·�5ήOέk3λήnY±9δ–>ΐ°�­Γ`΅ΩΏ�­›φ¤lΣvΛB�ιI3`Ί;½N-Ό,_1't;jφ/ζΖKτ‹Φί¤ν–…λ'·m±»cο*,¥�λ®΅άbΎ΄Fλ―se�bsy�³+ϊ�Βu­B!ΔΩ¤!„B¬	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ�Ή€»ΐ£�―»+/u®’Ώ†�ύΕλCγ;WΗή~oό6>Η*ΉΉxµb]Λ;ΐNrόάµφ9',?�τ|)Vύ­©“ρΉJη©΅τόsχΖ«oΦoβσΤΤ©ά=²®wgρY®Ώ_�{[±κJz/Ό>ρfΕχξ6~'mC}Ϋ�θΑά€‡›ΐο€KΞw>ή[Mqώ®SΉήσ·¥k)q�φ
cψNςήλΐρ€rxΌύ�ύ	Ο36�·�Ώ<_ψώΰZςήπΒΘεbλCΥ,ε6Oφ�―U|οΰ�—%Μ8ϊόP-5\^nψώχ8+:���T–”ΰΙθο�Lt�©ψmτ�OT|�Λ"ΰ;lχ�^�ΑΑ|χ:E-ζΙ“t3±SΞ2ƒ=x�η©»–Z>O�iύ*Λe‹ιξΧ³ΐ3‹��Π=›mβtεx�Ί�<
­M�sG
fYo2ng)¦ηWΐQζύ`��5πnζσ£Εos|Κx�xΈ°x]i*ιz¨™M¶ππ‘Βwv€W“χNθΉW8½Ώρ«t―cΡφ.έsί&ή£«³�OUώ.
_a>VΛΚΣWhφ­{bƒ¨qΰMΝ,«6 Θ{­;θζω
-ΎΝώ�t¦ψ”·ι|«Ηδgƒ�ωή4Waς_χθ�υg8ΫYήXΌ�Ng¤15ƒΣ,[Π¦”Wι�?>Κi{Ή}v�ξ…ΟR3½Ek@Μ�θ|[«†m―Οο“―£ΏYuAΔζP!�jhPΤ\πΆ�k^cDc{Σ)ώ”ί�¤ƒD� ά£sYΧU�΄ΟE�§Η©qC]g�¨<΅ΖσΈ<h<.δg�P?+λ³
-`Ϋύ��Φ8€,
�£eΕΐ&¬.�­&�!ξ�!+PΔ†�qΗ\LUk²‹tΉTν³]ϊ��RΕ�>»ΨΏXυ ±ό�eΣ:ΆΥkW/δ„S‰Ψ3ε¬lΫύ��>q5XΟq›VJδ�­&�mt��‰@T[fϋ·θLi�ΣΝ‚¦&(ιΫΙϋιb<5½KηΗ�»%#6�ζ�]j–½°ψΝ�Έό[–��™ψ¶‘:τβ-Ζ`Ϋύ��Ύq}ι#π6�Τo�Ί΄ΔΜx�Σ�?T-b�ή�ΒwΗdψkό—θL.aK«γ6ΎΉ~‰mζΐ3δgΕSV©i|jvθV	¤LνkήΦυ�)Cβ<,λ‹|εβάΡ²
- ΕΥ¨Ζ‡t
65AtΦ+
Πy™ϊ
<φ?YήΚ1έύ±®Ιr:ΎΘφvΘS3eRθΆυ�ΘΌ?d@φ&λ|S/—<ώ�ΐqΉ`Ήmv•aR!ϊyΥfΰσΘ>π}γ³mόc�wΟψNl)κcjL£Ηsυ/Έ+>Ίψ~�ΰ¦ςΆΎw€�’�µ²5CόyKΡSteO™�Τ|^ό��)βrΑrB�KJΰ€ΣYt)ό*‰;uoJ9~0U΅¬ 6θΚτe¶gπ_«Ί'!¦Δ[EP;K¶r,„ψ”ΤeT›@iLjύ�Φ�›΄LV�υ¬}©Πlω®+£Ε|β5KΥ¦Κ’Λ¤±Wπg�,>ϋ$«ol¥Α�³¨H	y	ΦMK:ή‡ΐk#�sJ_σyρ�¦�ΘεΚΨφBdy�Σ¨π[•Ώ‰ύλ«Μ�_,ƒΚ~�ε™Ψ5ΪΝΠ¥D@5+v�΅ΑΏ•uG\�Π%χi­3΅-ΥX¤¬�Sqήό��±γrΉΞƒXb‰Ψ²�εP‹�deρ·¨,s
�λ�_π–�_EƒΏΕΊ#®ƒΩΎ5©I0�ΧdΛ\υ5�7�`�8€tΉά6eϋΆ�� &ΐ+eΜe8η
/¨μψ«Ι› †q@}μ‹•Υ―•©,ηeύΚ�σ
qn(Ε%lε:ΛμΏΔ*ϋ:ό7…ΰ6ςβG^4ήO±²ϊwBκ2²r³OE‹�?MµΙΑkcΗ
Τ¦Έ�*π¶¥[Lm`�®Ζ*0E€m 4ψ_CΛ)WMΝ–ΌΗt«r®―'+~Ύ—‹υψ!yΑg-7{GB8Ώώ�ΐω„8χτΩXV
›oβg*,eά΄ε–Ϋ‚·‰K΄κΝ�¬�kΙ™ξ½=2¬σΥ
-�Ξ«�?0ΥΎB�kϊ€@M!VΕΠYmΛNpc`νΜψ]–ΐ19―ώ�€β„θΑ
~ΤUξ DΚΟ)Ρ>ƒΓr ·σβΨy[��2ΥΎB�kΖBlA�zω,.boψ³κΝ€ ›‰Ώ›Ό7φvήύ��M�Ψ„ΔA›P±αό½u`Ν�½Ύχσ³„τ½‡!PtlΖ~—θ6Άς�Ή|¥Η±�ι69Jwβ�‹ήL}Έ\y�Οτ(Ϋ¶1Φs―­Οι}½‹��΅εω®W†Zj―Ώζ{Κ�°αΘ D‡^嶙~DϋVΣ19ΧΕ3t�{9Β9ίdυ{	τ!έ™3ΞΊOη»�ΥnIΎi¤bμ-VοfΩ„2�-C`³I;ΘΦΧ*24�'ΖNA�ΫD&εψgc
,7ΐ�u ΔΊS)Ο‰t―oεΗy.ƒΨB$„8%”7„ΪM�ξ’χrω>B”θ΅Ξ5„$<©%ΖΚϋp^Λ ¶	€Ν&NΐΤηU³a‘8ε>]η9Gΐ+
ί…³‰�φ€’ο<EχL=Τω―†Ώs�ΥΖmBΔ#
 ΔYnΠ¶!V�[΄g²Μm'ό*υI�BΚauώ«γ]fΤ{¬oΣ±M(ƒΨR.<zτhέeB!Δ�‘@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!B!Δ‘B!f�€B1C$„B�"
 „BΜ	!„b†H!„3D@!„�!�μ@=V|IEND®B`‚

0FFTMM…B`�ΈGDEF_Υ€„NGPOSWµzί�TdGSUB"n'“€Τ€OS/2X›ƒς
ΈVcmapaΩΎr
Άcvt "�ΐfeatT�Τ,gasp��€|glyfΠΰ‘L5 headμc‹�
<6hheaυΒ
t$hmtx���w
+

0FFTMM…B`�ΈGDEF_Υ€„NGPOSWµzί�TdGSUB"n'“€Τ€OS/2X›ƒς
ΈVcmapaΩΎr
Άcvt "�ΐfeatT�Τ,gasp��€|glyfΠΰ‘L5 headμc‹�
<6hheaυΒ
t$hmtx���w
 kern33…=μloca§®µ:Δ
�maxp
	i
� morxΐNΘw‰
Pname Q›>Cπ:¤post#eη~”
ε

q¤Np_<υΕC#νΕC#ν�U�UUU
U�U
τ��UU
Β
Γ8

@.

ζ
τ™Μ�™Μ
λ3
	PfEd  ¬U�U
τU«
Τ
v"
U


U�UU��
U
U
U

�
U�
�UUUUU

��UUUU�
�UUU��U�UUUU�U�U
U
�
U��UUUU
�UU

�UU
UUUU
�U
�UUUUU
�

�

UUU�
U�
���
�
U
U�U

U
U������U
�
�
�
���������UUUUU�UUUUUUUUUUU


U
UUUUUUU�UUUUUUUUUU
�
€£¥§³·»�
S
a
x
~ ¬��  ¥§©µΉΏ
R
`
x
} ¬���γ�Γ�Β�Α�ΐ�Ώ�Ύ�»�i�]�G�Cΰ




	
 
 !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`ab€‚„�‘—�›��� Ά¤£¥¦¨§©�¬®­―±°µ΄¶·pefhu�ni�“qgtjx΅³zdlkyc{~�»Ό²ΊΏΒv}…|†ƒ�‰�‡���•–”o"�****>P~Όδ

(
B
\
x
�
�
�
¶
Τ>f�¨ΠξBTj�¤ΘθFj�ΆΊΠπ8^n�Ύδώ(Lz�¦Θτ"@bt� ζςBf„ΆΖΰ		(	>	X	~	�	°	Θ	ζ
 

docs/examples/web/text_bmfont_unordered.c

@@ -0,0 +1,65 @@
+/*******************************************************************************************
+*
+*   raylib [text] example - BMFont unordered chars loading and drawing
+*
+*   This example has been created using raylib 1.4 (www.raylib.com)
+*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*
+*   Copyright (c) 2016 Ramon Santamaria (@raysan5)
+*
+********************************************************************************************/
+
+#include "raylib.h"
+
+int main()
+{
+    // Initialization
+    //--------------------------------------------------------------------------------------
+    int screenWidth = 800;
+    int screenHeight = 450;
+
+    InitWindow(screenWidth, screenHeight, "raylib [text] example - bmfont unordered loading and drawing");
+
+    // NOTE: Using chars outside the [32..127] limits!
+    // NOTE: If a character is not found in the font, it just renders a space
+    const char msg[256] = "ASCII extended characters:\n¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆ\nÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæ\nçèéêëìíîïðñòóôõö÷øùúûüýþÿ";
+
+    // NOTE: Loaded font has an unordered list of characters (chars in the range 32..255)
+    SpriteFont font = LoadSpriteFont("resources/fonts/pixantiqua.fnt");       // BMFont (AngelCode)
+
+    SetTargetFPS(60);
+    //--------------------------------------------------------------------------------------
+
+    // Main game loop
+    while (!WindowShouldClose())    // Detect window close button or ESC key
+    {
+        // Update
+        //----------------------------------------------------------------------------------
+        // TODO: Update variables here...
+        //----------------------------------------------------------------------------------
+
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            DrawText("Font name:       PixAntiqua", 40, 50, 20, GRAY);
+            DrawText(FormatText("Font base size:           %i", font.baseSize), 40, 80, 20, GRAY);
+            DrawText(FormatText("Font chars number:     %i", font.charsCount), 40, 110, 20, GRAY);
+            
+            DrawTextEx(font, msg, (Vector2){ 40, 180 }, font.baseSize, 0, MAROON);
+
+        EndDrawing();
+        //----------------------------------------------------------------------------------
+    }
+
+    // De-Initialization
+    //--------------------------------------------------------------------------------------
+    UnloadSpriteFont(font);     // AngelCode SpriteFont unloading
+    
+    CloseWindow();                // Close window and OpenGL context
+    //--------------------------------------------------------------------------------------
+
+    return 0;
+}

docs/examples/web/text_font_select.c

@@ -77,7 +77,7 @@ int main()
                          
     fontNames = tempFontNames;
     
-    textSize = MeasureTextEx(fonts[currentFont], text, fonts[currentFont].size*3, 1);
+    textSize = MeasureTextEx(fonts[currentFont], text, fonts[currentFont].baseSize*3, 1);
     
     btnNextRec = (Rectangle){ 673, positionY, 109, 44 };    // Button rectangle (useful for collision)
     
@@ -166,7 +166,7 @@ void UpdateDrawFrame(void)
     }
 
     // Text measurement for better positioning on screen
-    textSize = MeasureTextEx(fonts[currentFont], text, fonts[currentFont].size*3, 1);
+    textSize = MeasureTextEx(fonts[currentFont], text, fonts[currentFont].baseSize*3, 1);
     //----------------------------------------------------------------------------------
 
     // Draw
@@ -188,7 +188,7 @@ void UpdateDrawFrame(void)
         DrawText("NEXT", 700, positionY + 13, 20, btnNextOutColor);
 
         DrawTextEx(fonts[currentFont], text, (Vector2){ screenWidth/2 - textSize.x/2,
-                   260 + (70 - textSize.y)/2 }, fonts[currentFont].size*3,
+                   260 + (70 - textSize.y)/2 }, fonts[currentFont].baseSize*3,
                    1, colors[currentFont]);
 
     EndDrawing();

docs/examples/web/text_rbmf_fonts.c

@@ -68,8 +68,8 @@ int main()
         
     for (int i = 0; i < 8; i++)
     {
-        positions[i].x = screenWidth/2 - MeasureTextEx(fonts[i], messages[i], fonts[i].size*2, spacings[i]).x/2;
-        positions[i].y = 60 + fonts[i].size + 50*i;
+        positions[i].x = screenWidth/2 - MeasureTextEx(fonts[i], messages[i], fonts[i].baseSize*2, spacings[i]).x/2;
+        positions[i].y = 60 + fonts[i].baseSize + 50*i;
     }
     
 #if defined(PLATFORM_WEB)
@@ -118,7 +118,7 @@ void UpdateDrawFrame(void)
         
         for (int i = 0; i < 8; i++)
         {
-            DrawTextEx(fonts[i], messages[i], positions[i], fonts[i].size*2, spacings[i], colors[i]);
+            DrawTextEx(fonts[i], messages[i], positions[i], fonts[i].baseSize*2, spacings[i], colors[i]);
         }
 
     EndDrawing();

docs/examples/web/text_sprite_fonts.c

@@ -50,14 +50,14 @@ int main()
     font2 = LoadSpriteFont("resources/fonts/custom_alagard.png");        // SpriteFont loading
     font3 = LoadSpriteFont("resources/fonts/custom_jupiter_crash.png");  // SpriteFont loading
     
-    fontPosition1.x = screenWidth/2 - MeasureTextEx(font1, msg1, font1.size, -3).x/2;
-    fontPosition1.y = screenHeight/2 - font1.size/2 - 80;
+    fontPosition1.x = screenWidth/2 - MeasureTextEx(font1, msg1, font1.baseSize, -3).x/2;
+    fontPosition1.y = screenHeight/2 - font1.baseSize/2 - 80;
 
-    fontPosition2.x = screenWidth/2 - MeasureTextEx(font2, msg2, font2.size, -2).x/2;
-    fontPosition2.y = screenHeight/2 - font2.size/2 - 10;
+    fontPosition2.x = screenWidth/2 - MeasureTextEx(font2, msg2, font2.baseSize, -2).x/2;
+    fontPosition2.y = screenHeight/2 - font2.baseSize/2 - 10;
 
-    fontPosition3.x = screenWidth/2 - MeasureTextEx(font3, msg3, font3.size, 2).x/2;
-    fontPosition3.y = screenHeight/2 - font3.size/2 + 50;
+    fontPosition3.x = screenWidth/2 - MeasureTextEx(font3, msg3, font3.baseSize, 2).x/2;
+    fontPosition3.y = screenHeight/2 - font3.baseSize/2 + 50;
     
 #if defined(PLATFORM_WEB)
     emscripten_set_main_loop(UpdateDrawFrame, 0, 1);
@@ -99,9 +99,9 @@ void UpdateDrawFrame(void)
 
         ClearBackground(RAYWHITE);
 
-        DrawTextEx(font1, msg1, fontPosition1, font1.size, -3, WHITE);
-        DrawTextEx(font2, msg2, fontPosition2, font2.size, -2, WHITE);
-        DrawTextEx(font3, msg3, fontPosition3, font3.size, 2, WHITE);
+        DrawTextEx(font1, msg1, fontPosition1, font1.baseSize, -3, WHITE);
+        DrawTextEx(font2, msg2, fontPosition2, font2.baseSize, -2, WHITE);
+        DrawTextEx(font3, msg3, fontPosition3, font3.baseSize, 2, WHITE);
 
     EndDrawing();
     //----------------------------------------------------------------------------------

docs/examples/web/text_ttf_loading.c

@@ -0,0 +1,130 @@
+/*******************************************************************************************
+*
+*   raylib [text] example - TTF loading and usage
+*
+*   This example has been created using raylib 1.3.0 (www.raylib.com)
+*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*
+*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
+*
+********************************************************************************************/
+
+#include "raylib.h"
+
+int main()
+{
+    // Initialization
+    //--------------------------------------------------------------------------------------
+    int screenWidth = 800;
+    int screenHeight = 450;
+
+    InitWindow(screenWidth, screenHeight, "raylib [text] example - ttf loading");
+    
+    const char msg[50] = "TTF SpriteFont";
+
+    // NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
+    
+    // TTF SpriteFont loading with custom generation parameters
+    SpriteFont font = LoadSpriteFontTTF("resources/fonts/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
+    GenTextureMipmaps(&font.texture);
+
+    float fontSize = font.baseSize;
+    Vector2 fontPosition = { 40, screenHeight/2 + 50 };
+    Vector2 textSize;
+
+    SetTextureFilter(font.texture, FILTER_POINT);
+    int currentFontFilter = 0;      // FILTER_POINT
+    
+    int count = 0;
+    char **droppedFiles;
+    
+    SetTargetFPS(60);
+    //--------------------------------------------------------------------------------------
+    
+    // Main game loop
+    while (!WindowShouldClose())    // Detect window close button or ESC key
+    {
+        // Update
+        //----------------------------------------------------------------------------------
+        fontSize += GetMouseWheelMove()*4.0f;
+        
+        // Choose font texture filter method
+        if (IsKeyPressed(KEY_ONE))
+        {
+            SetTextureFilter(font.texture, FILTER_POINT);
+            currentFontFilter = 0;
+        }
+        else if (IsKeyPressed(KEY_TWO))
+        {
+            SetTextureFilter(font.texture, FILTER_BILINEAR);
+            currentFontFilter = 1;
+        }
+        else if (IsKeyPressed(KEY_THREE))
+        {
+            // NOTE: Trilinear filter won't be noticed on 2D drawing
+            SetTextureFilter(font.texture, FILTER_TRILINEAR);
+            currentFontFilter = 2;
+        }
+        
+        textSize = MeasureTextEx(font, msg, fontSize, 0);
+        
+        if (IsKeyDown(KEY_LEFT)) fontPosition.x -= 10;
+        else if (IsKeyDown(KEY_RIGHT)) fontPosition.x += 10;
+        
+        // Load a dropped TTF file dynamically (at current fontSize)
+        if (IsFileDropped())
+        {
+            droppedFiles = GetDroppedFiles(&count);
+            
+            if (count == 1) // Only support one ttf file dropped
+            {
+                UnloadSpriteFont(font);
+                font = LoadSpriteFontTTF(droppedFiles[0], fontSize, 0, 0);
+                ClearDroppedFiles();
+            }
+        }
+        //----------------------------------------------------------------------------------
+        
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+        
+            ClearBackground(RAYWHITE);
+            
+            DrawText("Use mouse wheel to change font size", 20, 20, 10, GRAY);
+            DrawText("Use KEY_RIGHT and KEY_LEFT to move text", 20, 40, 10, GRAY);
+            DrawText("Use 1, 2, 3 to change texture filter", 20, 60, 10, GRAY);
+            DrawText("Drop a new TTF font for dynamic loading", 20, 80, 10, DARKGRAY);
+
+            DrawTextEx(font, msg, fontPosition, fontSize, 0, BLACK);
+            
+            // TODO: It seems texSize measurement is not accurate due to chars offsets...
+            //DrawRectangleLines(fontPosition.x, fontPosition.y, textSize.x, textSize.y, RED);
+            
+            DrawRectangle(0, screenHeight - 80, screenWidth, 80, LIGHTGRAY);
+            DrawText(FormatText("Font size: %02.02f", fontSize), 20, screenHeight - 50, 10, DARKGRAY);
+            DrawText(FormatText("Text size: [%02.02f, %02.02f]", textSize.x, textSize.y), 20, screenHeight - 30, 10, DARKGRAY);
+            DrawText("CURRENT TEXTURE FILTER:", 250, 400, 20, GRAY);
+            
+            if (currentFontFilter == 0) DrawText("POINT", 570, 400, 20, BLACK);
+            else if (currentFontFilter == 1) DrawText("BILINEAR", 570, 400, 20, BLACK);
+            else if (currentFontFilter == 2) DrawText("TRILINEAR", 570, 400, 20, BLACK);
+      
+        EndDrawing();
+        //----------------------------------------------------------------------------------
+    }
+
+    // De-Initialization
+    //--------------------------------------------------------------------------------------
+    UnloadSpriteFont(font);     // SpriteFont unloading
+    
+    ClearDroppedFiles();        // Clear internal buffers
+
+    CloseWindow();              // Close window and OpenGL context
+    //--------------------------------------------------------------------------------------
+    
+    return 0;
+}

project/vs2015/external/lua/include/lauxlib.h

@@ -1,256 +0,0 @@
-/*
-** $Id: lauxlib.h,v 1.129 2015/11/23 11:29:43 roberto Exp $
-** Auxiliary functions for building Lua libraries
-** See Copyright Notice in lua.h
-*/
-
-
-#ifndef lauxlib_h
-#define lauxlib_h
-
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include "lua.h"
-
-
-
-/* extra error code for 'luaL_load' */
-#define LUA_ERRFILE     (LUA_ERRERR+1)
-
-
-typedef struct luaL_Reg {
-  const char *name;
-  lua_CFunction func;
-} luaL_Reg;
-
-
-#define LUAL_NUMSIZES	(sizeof(lua_Integer)*16 + sizeof(lua_Number))
-
-LUALIB_API void (luaL_checkversion_) (lua_State *L, lua_Number ver, size_t sz);
-#define luaL_checkversion(L)  \
-	  luaL_checkversion_(L, LUA_VERSION_NUM, LUAL_NUMSIZES)
-
-LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
-LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
-LUALIB_API const char *(luaL_tolstring) (lua_State *L, int idx, size_t *len);
-LUALIB_API int (luaL_argerror) (lua_State *L, int arg, const char *extramsg);
-LUALIB_API const char *(luaL_checklstring) (lua_State *L, int arg,
-                                                          size_t *l);
-LUALIB_API const char *(luaL_optlstring) (lua_State *L, int arg,
-                                          const char *def, size_t *l);
-LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int arg);
-LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int arg, lua_Number def);
-
-LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int arg);
-LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int arg,
-                                          lua_Integer def);
-
-LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
-LUALIB_API void (luaL_checktype) (lua_State *L, int arg, int t);
-LUALIB_API void (luaL_checkany) (lua_State *L, int arg);
-
-LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
-LUALIB_API void  (luaL_setmetatable) (lua_State *L, const char *tname);
-LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
-LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
-
-LUALIB_API void (luaL_where) (lua_State *L, int lvl);
-LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
-
-LUALIB_API int (luaL_checkoption) (lua_State *L, int arg, const char *def,
-                                   const char *const lst[]);
-
-LUALIB_API int (luaL_fileresult) (lua_State *L, int stat, const char *fname);
-LUALIB_API int (luaL_execresult) (lua_State *L, int stat);
-
-/* predefined references */
-#define LUA_NOREF       (-2)
-#define LUA_REFNIL      (-1)
-
-LUALIB_API int (luaL_ref) (lua_State *L, int t);
-LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
-
-LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
-                                               const char *mode);
-
-#define luaL_loadfile(L,f)	luaL_loadfilex(L,f,NULL)
-
-LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
-                                   const char *name, const char *mode);
-LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
-
-LUALIB_API lua_State *(luaL_newstate) (void);
-
-LUALIB_API lua_Integer (luaL_len) (lua_State *L, int idx);
-
-LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
-                                                  const char *r);
-
-LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
-
-LUALIB_API int (luaL_getsubtable) (lua_State *L, int idx, const char *fname);
-
-LUALIB_API void (luaL_traceback) (lua_State *L, lua_State *L1,
-                                  const char *msg, int level);
-
-LUALIB_API void (luaL_requiref) (lua_State *L, const char *modname,
-                                 lua_CFunction openf, int glb);
-
-/*
-** ===============================================================
-** some useful macros
-** ===============================================================
-*/
-
-
-#define luaL_newlibtable(L,l)	\
-  lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
-
-#define luaL_newlib(L,l)  \
-  (luaL_checkversion(L), luaL_newlibtable(L,l), luaL_setfuncs(L,l,0))
-
-#define luaL_argcheck(L, cond,arg,extramsg)	\
-		((void)((cond) || luaL_argerror(L, (arg), (extramsg))))
-#define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
-#define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
-
-#define luaL_typename(L,i)	lua_typename(L, lua_type(L,(i)))
-
-#define luaL_dofile(L, fn) \
-	(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
-
-#define luaL_dostring(L, s) \
-	(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
-
-#define luaL_getmetatable(L,n)	(lua_getfield(L, LUA_REGISTRYINDEX, (n)))
-
-#define luaL_opt(L,f,n,d)	(lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
-
-#define luaL_loadbuffer(L,s,sz,n)	luaL_loadbufferx(L,s,sz,n,NULL)
-
-
-/*
-** {======================================================
-** Generic Buffer manipulation
-** =======================================================
-*/
-
-typedef struct luaL_Buffer {
-  char *b;  /* buffer address */
-  size_t size;  /* buffer size */
-  size_t n;  /* number of characters in buffer */
-  lua_State *L;
-  char initb[LUAL_BUFFERSIZE];  /* initial buffer */
-} luaL_Buffer;
-
-
-#define luaL_addchar(B,c) \
-  ((void)((B)->n < (B)->size || luaL_prepbuffsize((B), 1)), \
-   ((B)->b[(B)->n++] = (c)))
-
-#define luaL_addsize(B,s)	((B)->n += (s))
-
-LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
-LUALIB_API char *(luaL_prepbuffsize) (luaL_Buffer *B, size_t sz);
-LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
-LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
-LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
-LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
-LUALIB_API void (luaL_pushresultsize) (luaL_Buffer *B, size_t sz);
-LUALIB_API char *(luaL_buffinitsize) (lua_State *L, luaL_Buffer *B, size_t sz);
-
-#define luaL_prepbuffer(B)	luaL_prepbuffsize(B, LUAL_BUFFERSIZE)
-
-/* }====================================================== */
-
-
-
-/*
-** {======================================================
-** File handles for IO library
-** =======================================================
-*/
-
-/*
-** A file handle is a userdata with metatable 'LUA_FILEHANDLE' and
-** initial structure 'luaL_Stream' (it may contain other fields
-** after that initial structure).
-*/
-
-#define LUA_FILEHANDLE          "FILE*"
-
-
-typedef struct luaL_Stream {
-  FILE *f;  /* stream (NULL for incompletely created streams) */
-  lua_CFunction closef;  /* to close stream (NULL for closed streams) */
-} luaL_Stream;
-
-/* }====================================================== */
-
-
-
-/* compatibility with old module system */
-#if defined(LUA_COMPAT_MODULE)
-
-LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
-                                   int sizehint);
-LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname,
-                                const luaL_Reg *l, int nup);
-
-#define luaL_register(L,n,l)	(luaL_openlib(L,(n),(l),0))
-
-#endif
-
-
-/*
-** {==================================================================
-** "Abstraction Layer" for basic report of messages and errors
-** ===================================================================
-*/
-
-/* print a string */
-#if !defined(lua_writestring)
-#define lua_writestring(s,l)   fwrite((s), sizeof(char), (l), stdout)
-#endif
-
-/* print a newline and flush the output */
-#if !defined(lua_writeline)
-#define lua_writeline()        (lua_writestring("\n", 1), fflush(stdout))
-#endif
-
-/* print an error message */
-#if !defined(lua_writestringerror)
-#define lua_writestringerror(s,p) \
-        (fprintf(stderr, (s), (p)), fflush(stderr))
-#endif
-
-/* }================================================================== */
-
-
-/*
-** {============================================================
-** Compatibility with deprecated conversions
-** =============================================================
-*/
-#if defined(LUA_COMPAT_APIINTCASTS)
-
-#define luaL_checkunsigned(L,a)	((lua_Unsigned)luaL_checkinteger(L,a))
-#define luaL_optunsigned(L,a,d)	\
-	((lua_Unsigned)luaL_optinteger(L,a,(lua_Integer)(d)))
-
-#define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
-#define luaL_optint(L,n,d)	((int)luaL_optinteger(L, (n), (d)))
-
-#define luaL_checklong(L,n)	((long)luaL_checkinteger(L, (n)))
-#define luaL_optlong(L,n,d)	((long)luaL_optinteger(L, (n), (d)))
-
-#endif
-/* }============================================================ */
-
-
-
-#endif
-
-

project/vs2015/external/lua/include/lua.h

@@ -1,486 +0,0 @@
-/*
-** $Id: lua.h,v 1.331 2016/05/30 15:53:28 roberto Exp $
-** Lua - A Scripting Language
-** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
-** See Copyright Notice at the end of this file
-*/
-
-
-#ifndef lua_h
-#define lua_h
-
-#include <stdarg.h>
-#include <stddef.h>
-
-
-#include "luaconf.h"
-
-
-#define LUA_VERSION_MAJOR	"5"
-#define LUA_VERSION_MINOR	"3"
-#define LUA_VERSION_NUM		503
-#define LUA_VERSION_RELEASE	"3"
-
-#define LUA_VERSION	"Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
-#define LUA_RELEASE	LUA_VERSION "." LUA_VERSION_RELEASE
-#define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2016 Lua.org, PUC-Rio"
-#define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
-
-
-/* mark for precompiled code ('<esc>Lua') */
-#define LUA_SIGNATURE	"\x1bLua"
-
-/* option for multiple returns in 'lua_pcall' and 'lua_call' */
-#define LUA_MULTRET	(-1)
-
-
-/*
-** Pseudo-indices
-** (-LUAI_MAXSTACK is the minimum valid index; we keep some free empty
-** space after that to help overflow detection)
-*/
-#define LUA_REGISTRYINDEX	(-LUAI_MAXSTACK - 1000)
-#define lua_upvalueindex(i)	(LUA_REGISTRYINDEX - (i))
-
-
-/* thread status */
-#define LUA_OK		0
-#define LUA_YIELD	1
-#define LUA_ERRRUN	2
-#define LUA_ERRSYNTAX	3
-#define LUA_ERRMEM	4
-#define LUA_ERRGCMM	5
-#define LUA_ERRERR	6
-
-
-typedef struct lua_State lua_State;
-
-
-/*
-** basic types
-*/
-#define LUA_TNONE		(-1)
-
-#define LUA_TNIL		0
-#define LUA_TBOOLEAN		1
-#define LUA_TLIGHTUSERDATA	2
-#define LUA_TNUMBER		3
-#define LUA_TSTRING		4
-#define LUA_TTABLE		5
-#define LUA_TFUNCTION		6
-#define LUA_TUSERDATA		7
-#define LUA_TTHREAD		8
-
-#define LUA_NUMTAGS		9
-
-
-
-/* minimum Lua stack available to a C function */
-#define LUA_MINSTACK	20
-
-
-/* predefined values in the registry */
-#define LUA_RIDX_MAINTHREAD	1
-#define LUA_RIDX_GLOBALS	2
-#define LUA_RIDX_LAST		LUA_RIDX_GLOBALS
-
-
-/* type of numbers in Lua */
-typedef LUA_NUMBER lua_Number;
-
-
-/* type for integer functions */
-typedef LUA_INTEGER lua_Integer;
-
-/* unsigned integer type */
-typedef LUA_UNSIGNED lua_Unsigned;
-
-/* type for continuation-function contexts */
-typedef LUA_KCONTEXT lua_KContext;
-
-
-/*
-** Type for C functions registered with Lua
-*/
-typedef int (*lua_CFunction) (lua_State *L);
-
-/*
-** Type for continuation functions
-*/
-typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);
-
-
-/*
-** Type for functions that read/write blocks when loading/dumping Lua chunks
-*/
-typedef const char * (*lua_Reader) (lua_State *L, void *ud, size_t *sz);
-
-typedef int (*lua_Writer) (lua_State *L, const void *p, size_t sz, void *ud);
-
-
-/*
-** Type for memory-allocation functions
-*/
-typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
-
-
-
-/*
-** generic extra include file
-*/
-#if defined(LUA_USER_H)
-#include LUA_USER_H
-#endif
-
-
-/*
-** RCS ident string
-*/
-extern const char lua_ident[];
-
-
-/*
-** state manipulation
-*/
-LUA_API lua_State *(lua_newstate) (lua_Alloc f, void *ud);
-LUA_API void       (lua_close) (lua_State *L);
-LUA_API lua_State *(lua_newthread) (lua_State *L);
-
-LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
-
-
-LUA_API const lua_Number *(lua_version) (lua_State *L);
-
-
-/*
-** basic stack manipulation
-*/
-LUA_API int   (lua_absindex) (lua_State *L, int idx);
-LUA_API int   (lua_gettop) (lua_State *L);
-LUA_API void  (lua_settop) (lua_State *L, int idx);
-LUA_API void  (lua_pushvalue) (lua_State *L, int idx);
-LUA_API void  (lua_rotate) (lua_State *L, int idx, int n);
-LUA_API void  (lua_copy) (lua_State *L, int fromidx, int toidx);
-LUA_API int   (lua_checkstack) (lua_State *L, int n);
-
-LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
-
-
-/*
-** access functions (stack -> C)
-*/
-
-LUA_API int             (lua_isnumber) (lua_State *L, int idx);
-LUA_API int             (lua_isstring) (lua_State *L, int idx);
-LUA_API int             (lua_iscfunction) (lua_State *L, int idx);
-LUA_API int             (lua_isinteger) (lua_State *L, int idx);
-LUA_API int             (lua_isuserdata) (lua_State *L, int idx);
-LUA_API int             (lua_type) (lua_State *L, int idx);
-LUA_API const char     *(lua_typename) (lua_State *L, int tp);
-
-LUA_API lua_Number      (lua_tonumberx) (lua_State *L, int idx, int *isnum);
-LUA_API lua_Integer     (lua_tointegerx) (lua_State *L, int idx, int *isnum);
-LUA_API int             (lua_toboolean) (lua_State *L, int idx);
-LUA_API const char     *(lua_tolstring) (lua_State *L, int idx, size_t *len);
-LUA_API size_t          (lua_rawlen) (lua_State *L, int idx);
-LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
-LUA_API void	       *(lua_touserdata) (lua_State *L, int idx);
-LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
-LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
-
-
-/*
-** Comparison and arithmetic functions
-*/
-
-#define LUA_OPADD	0	/* ORDER TM, ORDER OP */
-#define LUA_OPSUB	1
-#define LUA_OPMUL	2
-#define LUA_OPMOD	3
-#define LUA_OPPOW	4
-#define LUA_OPDIV	5
-#define LUA_OPIDIV	6
-#define LUA_OPBAND	7
-#define LUA_OPBOR	8
-#define LUA_OPBXOR	9
-#define LUA_OPSHL	10
-#define LUA_OPSHR	11
-#define LUA_OPUNM	12
-#define LUA_OPBNOT	13
-
-LUA_API void  (lua_arith) (lua_State *L, int op);
-
-#define LUA_OPEQ	0
-#define LUA_OPLT	1
-#define LUA_OPLE	2
-
-LUA_API int   (lua_rawequal) (lua_State *L, int idx1, int idx2);
-LUA_API int   (lua_compare) (lua_State *L, int idx1, int idx2, int op);
-
-
-/*
-** push functions (C -> stack)
-*/
-LUA_API void        (lua_pushnil) (lua_State *L);
-LUA_API void        (lua_pushnumber) (lua_State *L, lua_Number n);
-LUA_API void        (lua_pushinteger) (lua_State *L, lua_Integer n);
-LUA_API const char *(lua_pushlstring) (lua_State *L, const char *s, size_t len);
-LUA_API const char *(lua_pushstring) (lua_State *L, const char *s);
-LUA_API const char *(lua_pushvfstring) (lua_State *L, const char *fmt,
-                                                      va_list argp);
-LUA_API const char *(lua_pushfstring) (lua_State *L, const char *fmt, ...);
-LUA_API void  (lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
-LUA_API void  (lua_pushboolean) (lua_State *L, int b);
-LUA_API void  (lua_pushlightuserdata) (lua_State *L, void *p);
-LUA_API int   (lua_pushthread) (lua_State *L);
-
-
-/*
-** get functions (Lua -> stack)
-*/
-LUA_API int (lua_getglobal) (lua_State *L, const char *name);
-LUA_API int (lua_gettable) (lua_State *L, int idx);
-LUA_API int (lua_getfield) (lua_State *L, int idx, const char *k);
-LUA_API int (lua_geti) (lua_State *L, int idx, lua_Integer n);
-LUA_API int (lua_rawget) (lua_State *L, int idx);
-LUA_API int (lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
-LUA_API int (lua_rawgetp) (lua_State *L, int idx, const void *p);
-
-LUA_API void  (lua_createtable) (lua_State *L, int narr, int nrec);
-LUA_API void *(lua_newuserdata) (lua_State *L, size_t sz);
-LUA_API int   (lua_getmetatable) (lua_State *L, int objindex);
-LUA_API int  (lua_getuservalue) (lua_State *L, int idx);
-
-
-/*
-** set functions (stack -> Lua)
-*/
-LUA_API void  (lua_setglobal) (lua_State *L, const char *name);
-LUA_API void  (lua_settable) (lua_State *L, int idx);
-LUA_API void  (lua_setfield) (lua_State *L, int idx, const char *k);
-LUA_API void  (lua_seti) (lua_State *L, int idx, lua_Integer n);
-LUA_API void  (lua_rawset) (lua_State *L, int idx);
-LUA_API void  (lua_rawseti) (lua_State *L, int idx, lua_Integer n);
-LUA_API void  (lua_rawsetp) (lua_State *L, int idx, const void *p);
-LUA_API int   (lua_setmetatable) (lua_State *L, int objindex);
-LUA_API void  (lua_setuservalue) (lua_State *L, int idx);
-
-
-/*
-** 'load' and 'call' functions (load and run Lua code)
-*/
-LUA_API void  (lua_callk) (lua_State *L, int nargs, int nresults,
-                           lua_KContext ctx, lua_KFunction k);
-#define lua_call(L,n,r)		lua_callk(L, (n), (r), 0, NULL)
-
-LUA_API int   (lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,
-                            lua_KContext ctx, lua_KFunction k);
-#define lua_pcall(L,n,r,f)	lua_pcallk(L, (n), (r), (f), 0, NULL)
-
-LUA_API int   (lua_load) (lua_State *L, lua_Reader reader, void *dt,
-                          const char *chunkname, const char *mode);
-
-LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data, int strip);
-
-
-/*
-** coroutine functions
-*/
-LUA_API int  (lua_yieldk)     (lua_State *L, int nresults, lua_KContext ctx,
-                               lua_KFunction k);
-LUA_API int  (lua_resume)     (lua_State *L, lua_State *from, int narg);
-LUA_API int  (lua_status)     (lua_State *L);
-LUA_API int (lua_isyieldable) (lua_State *L);
-
-#define lua_yield(L,n)		lua_yieldk(L, (n), 0, NULL)
-
-
-/*
-** garbage-collection function and options
-*/
-
-#define LUA_GCSTOP		0
-#define LUA_GCRESTART		1
-#define LUA_GCCOLLECT		2
-#define LUA_GCCOUNT		3
-#define LUA_GCCOUNTB		4
-#define LUA_GCSTEP		5
-#define LUA_GCSETPAUSE		6
-#define LUA_GCSETSTEPMUL	7
-#define LUA_GCISRUNNING		9
-
-LUA_API int (lua_gc) (lua_State *L, int what, int data);
-
-
-/*
-** miscellaneous functions
-*/
-
-LUA_API int   (lua_error) (lua_State *L);
-
-LUA_API int   (lua_next) (lua_State *L, int idx);
-
-LUA_API void  (lua_concat) (lua_State *L, int n);
-LUA_API void  (lua_len)    (lua_State *L, int idx);
-
-LUA_API size_t   (lua_stringtonumber) (lua_State *L, const char *s);
-
-LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
-LUA_API void      (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
-
-
-
-/*
-** {==============================================================
-** some useful macros
-** ===============================================================
-*/
-
-#define lua_getextraspace(L)	((void *)((char *)(L) - LUA_EXTRASPACE))
-
-#define lua_tonumber(L,i)	lua_tonumberx(L,(i),NULL)
-#define lua_tointeger(L,i)	lua_tointegerx(L,(i),NULL)
-
-#define lua_pop(L,n)		lua_settop(L, -(n)-1)
-
-#define lua_newtable(L)		lua_createtable(L, 0, 0)
-
-#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
-
-#define lua_pushcfunction(L,f)	lua_pushcclosure(L, (f), 0)
-
-#define lua_isfunction(L,n)	(lua_type(L, (n)) == LUA_TFUNCTION)
-#define lua_istable(L,n)	(lua_type(L, (n)) == LUA_TTABLE)
-#define lua_islightuserdata(L,n)	(lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
-#define lua_isnil(L,n)		(lua_type(L, (n)) == LUA_TNIL)
-#define lua_isboolean(L,n)	(lua_type(L, (n)) == LUA_TBOOLEAN)
-#define lua_isthread(L,n)	(lua_type(L, (n)) == LUA_TTHREAD)
-#define lua_isnone(L,n)		(lua_type(L, (n)) == LUA_TNONE)
-#define lua_isnoneornil(L, n)	(lua_type(L, (n)) <= 0)
-
-#define lua_pushliteral(L, s)	lua_pushstring(L, "" s)
-
-#define lua_pushglobaltable(L)  \
-	((void)lua_rawgeti(L, LUA_REGISTRYINDEX, LUA_RIDX_GLOBALS))
-
-#define lua_tostring(L,i)	lua_tolstring(L, (i), NULL)
-
-
-#define lua_insert(L,idx)	lua_rotate(L, (idx), 1)
-
-#define lua_remove(L,idx)	(lua_rotate(L, (idx), -1), lua_pop(L, 1))
-
-#define lua_replace(L,idx)	(lua_copy(L, -1, (idx)), lua_pop(L, 1))
-
-/* }============================================================== */
-
-
-/*
-** {==============================================================
-** compatibility macros for unsigned conversions
-** ===============================================================
-*/
-#if defined(LUA_COMPAT_APIINTCASTS)
-
-#define lua_pushunsigned(L,n)	lua_pushinteger(L, (lua_Integer)(n))
-#define lua_tounsignedx(L,i,is)	((lua_Unsigned)lua_tointegerx(L,i,is))
-#define lua_tounsigned(L,i)	lua_tounsignedx(L,(i),NULL)
-
-#endif
-/* }============================================================== */
-
-/*
-** {======================================================================
-** Debug API
-** =======================================================================
-*/
-
-
-/*
-** Event codes
-*/
-#define LUA_HOOKCALL	0
-#define LUA_HOOKRET	1
-#define LUA_HOOKLINE	2
-#define LUA_HOOKCOUNT	3
-#define LUA_HOOKTAILCALL 4
-
-
-/*
-** Event masks
-*/
-#define LUA_MASKCALL	(1 << LUA_HOOKCALL)
-#define LUA_MASKRET	(1 << LUA_HOOKRET)
-#define LUA_MASKLINE	(1 << LUA_HOOKLINE)
-#define LUA_MASKCOUNT	(1 << LUA_HOOKCOUNT)
-
-typedef struct lua_Debug lua_Debug;  /* activation record */
-
-
-/* Functions to be called by the debugger in specific events */
-typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
-
-
-LUA_API int (lua_getstack) (lua_State *L, int level, lua_Debug *ar);
-LUA_API int (lua_getinfo) (lua_State *L, const char *what, lua_Debug *ar);
-LUA_API const char *(lua_getlocal) (lua_State *L, const lua_Debug *ar, int n);
-LUA_API const char *(lua_setlocal) (lua_State *L, const lua_Debug *ar, int n);
-LUA_API const char *(lua_getupvalue) (lua_State *L, int funcindex, int n);
-LUA_API const char *(lua_setupvalue) (lua_State *L, int funcindex, int n);
-
-LUA_API void *(lua_upvalueid) (lua_State *L, int fidx, int n);
-LUA_API void  (lua_upvaluejoin) (lua_State *L, int fidx1, int n1,
-                                               int fidx2, int n2);
-
-LUA_API void (lua_sethook) (lua_State *L, lua_Hook func, int mask, int count);
-LUA_API lua_Hook (lua_gethook) (lua_State *L);
-LUA_API int (lua_gethookmask) (lua_State *L);
-LUA_API int (lua_gethookcount) (lua_State *L);
-
-
-struct lua_Debug {
-  int event;
-  const char *name;	/* (n) */
-  const char *namewhat;	/* (n) 'global', 'local', 'field', 'method' */
-  const char *what;	/* (S) 'Lua', 'C', 'main', 'tail' */
-  const char *source;	/* (S) */
-  int currentline;	/* (l) */
-  int linedefined;	/* (S) */
-  int lastlinedefined;	/* (S) */
-  unsigned char nups;	/* (u) number of upvalues */
-  unsigned char nparams;/* (u) number of parameters */
-  char isvararg;        /* (u) */
-  char istailcall;	/* (t) */
-  char short_src[LUA_IDSIZE]; /* (S) */
-  /* private part */
-  struct CallInfo *i_ci;  /* active function */
-};
-
-/* }====================================================================== */
-
-
-/******************************************************************************
-* Copyright (C) 1994-2016 Lua.org, PUC-Rio.
-*
-* Permission is hereby granted, free of charge, to any person obtaining
-* a copy of this software and associated documentation files (the
-* "Software"), to deal in the Software without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to
-* permit persons to whom the Software is furnished to do so, subject to
-* the following conditions:
-*
-* The above copyright notice and this permission notice shall be
-* included in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-
-
-#endif

project/vs2015/external/lua/include/lua.hpp

@@ -1,9 +0,0 @@
-// lua.hpp
-// Lua header files for C++
-// <<extern "C">> not supplied automatically because Lua also compiles as C++
-
-extern "C" {
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-}

project/vs2015/external/lua/include/luaconf.h

@@ -1,769 +0,0 @@
-/*
-** $Id: luaconf.h,v 1.255 2016/05/01 20:06:09 roberto Exp $
-** Configuration file for Lua
-** See Copyright Notice in lua.h
-*/
-
-
-#ifndef luaconf_h
-#define luaconf_h
-
-#include <limits.h>
-#include <stddef.h>
-
-
-/*
-** ===================================================================
-** Search for "@@" to find all configurable definitions.
-** ===================================================================
-*/
-
-
-/*
-** {====================================================================
-** System Configuration: macros to adapt (if needed) Lua to some
-** particular platform, for instance compiling it with 32-bit numbers or
-** restricting it to C89.
-** =====================================================================
-*/
-
-/*
-@@ LUA_32BITS enables Lua with 32-bit integers and 32-bit floats. You
-** can also define LUA_32BITS in the make file, but changing here you
-** ensure that all software connected to Lua will be compiled with the
-** same configuration.
-*/
-/* #define LUA_32BITS */
-
-
-/*
-@@ LUA_USE_C89 controls the use of non-ISO-C89 features.
-** Define it if you want Lua to avoid the use of a few C99 features
-** or Windows-specific features on Windows.
-*/
-/* #define LUA_USE_C89 */
-
-
-/*
-** By default, Lua on Windows use (some) specific Windows features
-*/
-#if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE)
-#define LUA_USE_WINDOWS  /* enable goodies for regular Windows */
-#endif
-
-
-#if defined(LUA_USE_WINDOWS)
-#define LUA_DL_DLL	/* enable support for DLL */
-#define LUA_USE_C89	/* broadly, Windows is C89 */
-#endif
-
-
-#if defined(LUA_USE_LINUX)
-#define LUA_USE_POSIX
-#define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
-#define LUA_USE_READLINE	/* needs some extra libraries */
-#endif
-
-
-#if defined(LUA_USE_MACOSX)
-#define LUA_USE_POSIX
-#define LUA_USE_DLOPEN		/* MacOS does not need -ldl */
-#define LUA_USE_READLINE	/* needs an extra library: -lreadline */
-#endif
-
-
-/*
-@@ LUA_C89_NUMBERS ensures that Lua uses the largest types available for
-** C89 ('long' and 'double'); Windows always has '__int64', so it does
-** not need to use this case.
-*/
-#if defined(LUA_USE_C89) && !defined(LUA_USE_WINDOWS)
-#define LUA_C89_NUMBERS
-#endif
-
-
-
-/*
-@@ LUAI_BITSINT defines the (minimum) number of bits in an 'int'.
-*/
-/* avoid undefined shifts */
-#if ((INT_MAX >> 15) >> 15) >= 1
-#define LUAI_BITSINT	32
-#else
-/* 'int' always must have at least 16 bits */
-#define LUAI_BITSINT	16
-#endif
-
-
-/*
-@@ LUA_INT_TYPE defines the type for Lua integers.
-@@ LUA_FLOAT_TYPE defines the type for Lua floats.
-** Lua should work fine with any mix of these options (if supported
-** by your C compiler). The usual configurations are 64-bit integers
-** and 'double' (the default), 32-bit integers and 'float' (for
-** restricted platforms), and 'long'/'double' (for C compilers not
-** compliant with C99, which may not have support for 'long long').
-*/
-
-/* predefined options for LUA_INT_TYPE */
-#define LUA_INT_INT		1
-#define LUA_INT_LONG		2
-#define LUA_INT_LONGLONG	3
-
-/* predefined options for LUA_FLOAT_TYPE */
-#define LUA_FLOAT_FLOAT		1
-#define LUA_FLOAT_DOUBLE	2
-#define LUA_FLOAT_LONGDOUBLE	3
-
-#if defined(LUA_32BITS)		/* { */
-/*
-** 32-bit integers and 'float'
-*/
-#if LUAI_BITSINT >= 32  /* use 'int' if big enough */
-#define LUA_INT_TYPE	LUA_INT_INT
-#else  /* otherwise use 'long' */
-#define LUA_INT_TYPE	LUA_INT_LONG
-#endif
-#define LUA_FLOAT_TYPE	LUA_FLOAT_FLOAT
-
-#elif defined(LUA_C89_NUMBERS)	/* }{ */
-/*
-** largest types available for C89 ('long' and 'double')
-*/
-#define LUA_INT_TYPE	LUA_INT_LONG
-#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
-
-#endif				/* } */
-
-
-/*
-** default configuration for 64-bit Lua ('long long' and 'double')
-*/
-#if !defined(LUA_INT_TYPE)
-#define LUA_INT_TYPE	LUA_INT_LONGLONG
-#endif
-
-#if !defined(LUA_FLOAT_TYPE)
-#define LUA_FLOAT_TYPE	LUA_FLOAT_DOUBLE
-#endif
-
-/* }================================================================== */
-
-
-
-
-/*
-** {==================================================================
-** Configuration for Paths.
-** ===================================================================
-*/
-
-/*
-@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
-** Lua libraries.
-@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
-** C libraries.
-** CHANGE them if your machine has a non-conventional directory
-** hierarchy or if you want to install your libraries in
-** non-conventional directories.
-*/
-#define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
-#if defined(_WIN32)	/* { */
-/*
-** In Windows, any exclamation mark ('!') in the path is replaced by the
-** path of the directory of the executable file of the current process.
-*/
-#define LUA_LDIR	"!\\lua\\"
-#define LUA_CDIR	"!\\"
-#define LUA_SHRDIR	"!\\..\\share\\lua\\" LUA_VDIR "\\"
-#define LUA_PATH_DEFAULT  \
-		LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
-		LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua;" \
-		LUA_SHRDIR"?.lua;" LUA_SHRDIR"?\\init.lua;" \
-		".\\?.lua;" ".\\?\\init.lua"
-#define LUA_CPATH_DEFAULT \
-		LUA_CDIR"?.dll;" \
-		LUA_CDIR"..\\lib\\lua\\" LUA_VDIR "\\?.dll;" \
-		LUA_CDIR"loadall.dll;" ".\\?.dll;" \
-    LUA_CDIR"?53.dll;" ".\\?53.dll"
-
-#else			/* }{ */
-
-#define LUA_ROOT	"/usr/local/"
-#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
-#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
-#define LUA_PATH_DEFAULT  \
-		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
-		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
-		"./?.lua;" "./?/init.lua"
-#define LUA_CPATH_DEFAULT \
-		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so;" \
-    LUA_CDIR"lib?53.so;" "./lib?53.so"
-#endif			/* } */
-
-
-/*
-@@ LUA_DIRSEP is the directory separator (for submodules).
-** CHANGE it if your machine does not use "/" as the directory separator
-** and is not Windows. (On Windows Lua automatically uses "\".)
-*/
-#if defined(_WIN32)
-#define LUA_DIRSEP	"\\"
-#else
-#define LUA_DIRSEP	"/"
-#endif
-
-/* }================================================================== */
-
-
-/*
-** {==================================================================
-** Marks for exported symbols in the C code
-** ===================================================================
-*/
-
-/*
-@@ LUA_API is a mark for all core API functions.
-@@ LUALIB_API is a mark for all auxiliary library functions.
-@@ LUAMOD_API is a mark for all standard library opening functions.
-** CHANGE them if you need to define those functions in some special way.
-** For instance, if you want to create one Windows DLL with the core and
-** the libraries, you may want to use the following definition (define
-** LUA_BUILD_AS_DLL to get it).
-*/
-#if defined(LUA_BUILD_AS_DLL)	/* { */
-
-#if defined(LUA_CORE) || defined(LUA_LIB)	/* { */
-#define LUA_API __declspec(dllexport)
-#else						/* }{ */
-#define LUA_API __declspec(dllimport)
-#endif						/* } */
-
-#else				/* }{ */
-
-#define LUA_API		extern
-
-#endif				/* } */
-
-
-/* more often than not the libs go together with the core */
-#define LUALIB_API	LUA_API
-#define LUAMOD_API	LUALIB_API
-
-
-/*
-@@ LUAI_FUNC is a mark for all extern functions that are not to be
-** exported to outside modules.
-@@ LUAI_DDEF and LUAI_DDEC are marks for all extern (const) variables
-** that are not to be exported to outside modules (LUAI_DDEF for
-** definitions and LUAI_DDEC for declarations).
-** CHANGE them if you need to mark them in some special way. Elf/gcc
-** (versions 3.2 and later) mark them as "hidden" to optimize access
-** when Lua is compiled as a shared library. Not all elf targets support
-** this attribute. Unfortunately, gcc does not offer a way to check
-** whether the target offers that support, and those without support
-** give a warning about it. To avoid these warnings, change to the
-** default definition.
-*/
-#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
-    defined(__ELF__)		/* { */
-#define LUAI_FUNC	__attribute__((visibility("hidden"))) extern
-#else				/* }{ */
-#define LUAI_FUNC	extern
-#endif				/* } */
-
-#define LUAI_DDEC	LUAI_FUNC
-#define LUAI_DDEF	/* empty */
-
-/* }================================================================== */
-
-
-/*
-** {==================================================================
-** Compatibility with previous versions
-** ===================================================================
-*/
-
-/*
-@@ LUA_COMPAT_5_2 controls other macros for compatibility with Lua 5.2.
-@@ LUA_COMPAT_5_1 controls other macros for compatibility with Lua 5.1.
-** You can define it to get all options, or change specific options
-** to fit your specific needs.
-*/
-#if defined(LUA_COMPAT_5_2)	/* { */
-
-/*
-@@ LUA_COMPAT_MATHLIB controls the presence of several deprecated
-** functions in the mathematical library.
-*/
-#define LUA_COMPAT_MATHLIB
-
-/*
-@@ LUA_COMPAT_BITLIB controls the presence of library 'bit32'.
-*/
-#define LUA_COMPAT_BITLIB
-
-/*
-@@ LUA_COMPAT_IPAIRS controls the effectiveness of the __ipairs metamethod.
-*/
-#define LUA_COMPAT_IPAIRS
-
-/*
-@@ LUA_COMPAT_APIINTCASTS controls the presence of macros for
-** manipulating other integer types (lua_pushunsigned, lua_tounsigned,
-** luaL_checkint, luaL_checklong, etc.)
-*/
-#define LUA_COMPAT_APIINTCASTS
-
-#endif				/* } */
-
-
-#if defined(LUA_COMPAT_5_1)	/* { */
-
-/* Incompatibilities from 5.2 -> 5.3 */
-#define LUA_COMPAT_MATHLIB
-#define LUA_COMPAT_APIINTCASTS
-
-/*
-@@ LUA_COMPAT_UNPACK controls the presence of global 'unpack'.
-** You can replace it with 'table.unpack'.
-*/
-#define LUA_COMPAT_UNPACK
-
-/*
-@@ LUA_COMPAT_LOADERS controls the presence of table 'package.loaders'.
-** You can replace it with 'package.searchers'.
-*/
-#define LUA_COMPAT_LOADERS
-
-/*
-@@ macro 'lua_cpcall' emulates deprecated function lua_cpcall.
-** You can call your C function directly (with light C functions).
-*/
-#define lua_cpcall(L,f,u)  \
-	(lua_pushcfunction(L, (f)), \
-	 lua_pushlightuserdata(L,(u)), \
-	 lua_pcall(L,1,0,0))
-
-
-/*
-@@ LUA_COMPAT_LOG10 defines the function 'log10' in the math library.
-** You can rewrite 'log10(x)' as 'log(x, 10)'.
-*/
-#define LUA_COMPAT_LOG10
-
-/*
-@@ LUA_COMPAT_LOADSTRING defines the function 'loadstring' in the base
-** library. You can rewrite 'loadstring(s)' as 'load(s)'.
-*/
-#define LUA_COMPAT_LOADSTRING
-
-/*
-@@ LUA_COMPAT_MAXN defines the function 'maxn' in the table library.
-*/
-#define LUA_COMPAT_MAXN
-
-/*
-@@ The following macros supply trivial compatibility for some
-** changes in the API. The macros themselves document how to
-** change your code to avoid using them.
-*/
-#define lua_strlen(L,i)		lua_rawlen(L, (i))
-
-#define lua_objlen(L,i)		lua_rawlen(L, (i))
-
-#define lua_equal(L,idx1,idx2)		lua_compare(L,(idx1),(idx2),LUA_OPEQ)
-#define lua_lessthan(L,idx1,idx2)	lua_compare(L,(idx1),(idx2),LUA_OPLT)
-
-/*
-@@ LUA_COMPAT_MODULE controls compatibility with previous
-** module functions 'module' (Lua) and 'luaL_register' (C).
-*/
-#define LUA_COMPAT_MODULE
-
-#endif				/* } */
-
-
-/*
-@@ LUA_COMPAT_FLOATSTRING makes Lua format integral floats without a
-@@ a float mark ('.0').
-** This macro is not on by default even in compatibility mode,
-** because this is not really an incompatibility.
-*/
-/* #define LUA_COMPAT_FLOATSTRING */
-
-/* }================================================================== */
-
-
-
-/*
-** {==================================================================
-** Configuration for Numbers.
-** Change these definitions if no predefined LUA_FLOAT_* / LUA_INT_*
-** satisfy your needs.
-** ===================================================================
-*/
-
-/*
-@@ LUA_NUMBER is the floating-point type used by Lua.
-@@ LUAI_UACNUMBER is the result of an 'usual argument conversion'
-@@ over a floating number.
-@@ l_mathlim(x) corrects limit name 'x' to the proper float type
-** by prefixing it with one of FLT/DBL/LDBL.
-@@ LUA_NUMBER_FRMLEN is the length modifier for writing floats.
-@@ LUA_NUMBER_FMT is the format for writing floats.
-@@ lua_number2str converts a float to a string.
-@@ l_mathop allows the addition of an 'l' or 'f' to all math operations.
-@@ l_floor takes the floor of a float.
-@@ lua_str2number converts a decimal numeric string to a number.
-*/
-
-
-/* The following definitions are good for most cases here */
-
-#define l_floor(x)		(l_mathop(floor)(x))
-
-#define lua_number2str(s,sz,n)	l_sprintf((s), sz, LUA_NUMBER_FMT, (n))
-
-/*
-@@ lua_numbertointeger converts a float number to an integer, or
-** returns 0 if float is not within the range of a lua_Integer.
-** (The range comparisons are tricky because of rounding. The tests
-** here assume a two-complement representation, where MININTEGER always
-** has an exact representation as a float; MAXINTEGER may not have one,
-** and therefore its conversion to float may have an ill-defined value.)
-*/
-#define lua_numbertointeger(n,p) \
-  ((n) >= (LUA_NUMBER)(LUA_MININTEGER) && \
-   (n) < -(LUA_NUMBER)(LUA_MININTEGER) && \
-      (*(p) = (LUA_INTEGER)(n), 1))
-
-
-/* now the variable definitions */
-
-#if LUA_FLOAT_TYPE == LUA_FLOAT_FLOAT		/* { single float */
-
-#define LUA_NUMBER	float
-
-#define l_mathlim(n)		(FLT_##n)
-
-#define LUAI_UACNUMBER	double
-
-#define LUA_NUMBER_FRMLEN	""
-#define LUA_NUMBER_FMT		"%.7g"
-
-#define l_mathop(op)		op##f
-
-#define lua_str2number(s,p)	strtof((s), (p))
-
-
-#elif LUA_FLOAT_TYPE == LUA_FLOAT_LONGDOUBLE	/* }{ long double */
-
-#define LUA_NUMBER	long double
-
-#define l_mathlim(n)		(LDBL_##n)
-
-#define LUAI_UACNUMBER	long double
-
-#define LUA_NUMBER_FRMLEN	"L"
-#define LUA_NUMBER_FMT		"%.19Lg"
-
-#define l_mathop(op)		op##l
-
-#define lua_str2number(s,p)	strtold((s), (p))
-
-#elif LUA_FLOAT_TYPE == LUA_FLOAT_DOUBLE	/* }{ double */
-
-#define LUA_NUMBER	double
-
-#define l_mathlim(n)		(DBL_##n)
-
-#define LUAI_UACNUMBER	double
-
-#define LUA_NUMBER_FRMLEN	""
-#define LUA_NUMBER_FMT		"%.14g"
-
-#define l_mathop(op)		op
-
-#define lua_str2number(s,p)	strtod((s), (p))
-
-#else						/* }{ */
-
-#error "numeric float type not defined"
-
-#endif					/* } */
-
-
-
-/*
-@@ LUA_INTEGER is the integer type used by Lua.
-**
-@@ LUA_UNSIGNED is the unsigned version of LUA_INTEGER.
-**
-@@ LUAI_UACINT is the result of an 'usual argument conversion'
-@@ over a lUA_INTEGER.
-@@ LUA_INTEGER_FRMLEN is the length modifier for reading/writing integers.
-@@ LUA_INTEGER_FMT is the format for writing integers.
-@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER.
-@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER.
-@@ lua_integer2str converts an integer to a string.
-*/
-
-
-/* The following definitions are good for most cases here */
-
-#define LUA_INTEGER_FMT		"%" LUA_INTEGER_FRMLEN "d"
-#define lua_integer2str(s,sz,n)	l_sprintf((s), sz, LUA_INTEGER_FMT, (n))
-
-#define LUAI_UACINT		LUA_INTEGER
-
-/*
-** use LUAI_UACINT here to avoid problems with promotions (which
-** can turn a comparison between unsigneds into a signed comparison)
-*/
-#define LUA_UNSIGNED		unsigned LUAI_UACINT
-
-
-/* now the variable definitions */
-
-#if LUA_INT_TYPE == LUA_INT_INT		/* { int */
-
-#define LUA_INTEGER		int
-#define LUA_INTEGER_FRMLEN	""
-
-#define LUA_MAXINTEGER		INT_MAX
-#define LUA_MININTEGER		INT_MIN
-
-#elif LUA_INT_TYPE == LUA_INT_LONG	/* }{ long */
-
-#define LUA_INTEGER		long
-#define LUA_INTEGER_FRMLEN	"l"
-
-#define LUA_MAXINTEGER		LONG_MAX
-#define LUA_MININTEGER		LONG_MIN
-
-#elif LUA_INT_TYPE == LUA_INT_LONGLONG	/* }{ long long */
-
-/* use presence of macro LLONG_MAX as proxy for C99 compliance */
-#if defined(LLONG_MAX)		/* { */
-/* use ISO C99 stuff */
-
-#define LUA_INTEGER		long long
-#define LUA_INTEGER_FRMLEN	"ll"
-
-#define LUA_MAXINTEGER		LLONG_MAX
-#define LUA_MININTEGER		LLONG_MIN
-
-#elif defined(LUA_USE_WINDOWS) /* }{ */
-/* in Windows, can use specific Windows types */
-
-#define LUA_INTEGER		__int64
-#define LUA_INTEGER_FRMLEN	"I64"
-
-#define LUA_MAXINTEGER		_I64_MAX
-#define LUA_MININTEGER		_I64_MIN
-
-#else				/* }{ */
-
-#error "Compiler does not support 'long long'. Use option '-DLUA_32BITS' \
-  or '-DLUA_C89_NUMBERS' (see file 'luaconf.h' for details)"
-
-#endif				/* } */
-
-#else				/* }{ */
-
-#error "numeric integer type not defined"
-
-#endif				/* } */
-
-/* }================================================================== */
-
-
-/*
-** {==================================================================
-** Dependencies with C99 and other C details
-** ===================================================================
-*/
-
-/*
-@@ l_sprintf is equivalent to 'snprintf' or 'sprintf' in C89.
-** (All uses in Lua have only one format item.)
-*/
-#if !defined(LUA_USE_C89)
-#define l_sprintf(s,sz,f,i)	snprintf(s,sz,f,i)
-#else
-#define l_sprintf(s,sz,f,i)	((void)(sz), sprintf(s,f,i))
-#endif
-
-
-/*
-@@ lua_strx2number converts an hexadecimal numeric string to a number.
-** In C99, 'strtod' does that conversion. Otherwise, you can
-** leave 'lua_strx2number' undefined and Lua will provide its own
-** implementation.
-*/
-#if !defined(LUA_USE_C89)
-#define lua_strx2number(s,p)		lua_str2number(s,p)
-#endif
-
-
-/*
-@@ lua_number2strx converts a float to an hexadecimal numeric string. 
-** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that.
-** Otherwise, you can leave 'lua_number2strx' undefined and Lua will
-** provide its own implementation.
-*/
-#if !defined(LUA_USE_C89)
-#define lua_number2strx(L,b,sz,f,n)	((void)L, l_sprintf(b,sz,f,n))
-#endif
-
-
-/*
-** 'strtof' and 'opf' variants for math functions are not valid in
-** C89. Otherwise, the macro 'HUGE_VALF' is a good proxy for testing the
-** availability of these variants. ('math.h' is already included in
-** all files that use these macros.)
-*/
-#if defined(LUA_USE_C89) || (defined(HUGE_VAL) && !defined(HUGE_VALF))
-#undef l_mathop  /* variants not available */
-#undef lua_str2number
-#define l_mathop(op)		(lua_Number)op  /* no variant */
-#define lua_str2number(s,p)	((lua_Number)strtod((s), (p)))
-#endif
-
-
-/*
-@@ LUA_KCONTEXT is the type of the context ('ctx') for continuation
-** functions.  It must be a numerical type; Lua will use 'intptr_t' if
-** available, otherwise it will use 'ptrdiff_t' (the nearest thing to
-** 'intptr_t' in C89)
-*/
-#define LUA_KCONTEXT	ptrdiff_t
-
-#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
-    __STDC_VERSION__ >= 199901L
-#include <stdint.h>
-#if defined(INTPTR_MAX)  /* even in C99 this type is optional */
-#undef LUA_KCONTEXT
-#define LUA_KCONTEXT	intptr_t
-#endif
-#endif
-
-
-/*
-@@ lua_getlocaledecpoint gets the locale "radix character" (decimal point).
-** Change that if you do not want to use C locales. (Code using this
-** macro must include header 'locale.h'.)
-*/
-#if !defined(lua_getlocaledecpoint)
-#define lua_getlocaledecpoint()		(localeconv()->decimal_point[0])
-#endif
-
-/* }================================================================== */
-
-
-/*
-** {==================================================================
-** Language Variations
-** =====================================================================
-*/
-
-/*
-@@ LUA_NOCVTN2S/LUA_NOCVTS2N control how Lua performs some
-** coercions. Define LUA_NOCVTN2S to turn off automatic coercion from
-** numbers to strings. Define LUA_NOCVTS2N to turn off automatic
-** coercion from strings to numbers.
-*/
-/* #define LUA_NOCVTN2S */
-/* #define LUA_NOCVTS2N */
-
-
-/*
-@@ LUA_USE_APICHECK turns on several consistency checks on the C API.
-** Define it as a help when debugging C code.
-*/
-#if defined(LUA_USE_APICHECK)
-#include <assert.h>
-#define luai_apicheck(l,e)	assert(e)
-#endif
-
-/* }================================================================== */
-
-
-/*
-** {==================================================================
-** Macros that affect the API and must be stable (that is, must be the
-** same when you compile Lua and when you compile code that links to
-** Lua). You probably do not want/need to change them.
-** =====================================================================
-*/
-
-/*
-@@ LUAI_MAXSTACK limits the size of the Lua stack.
-** CHANGE it if you need a different limit. This limit is arbitrary;
-** its only purpose is to stop Lua from consuming unlimited stack
-** space (and to reserve some numbers for pseudo-indices).
-*/
-#if LUAI_BITSINT >= 32
-#define LUAI_MAXSTACK		1000000
-#else
-#define LUAI_MAXSTACK		15000
-#endif
-
-
-/*
-@@ LUA_EXTRASPACE defines the size of a raw memory area associated with
-** a Lua state with very fast access.
-** CHANGE it if you need a different size.
-*/
-#define LUA_EXTRASPACE		(sizeof(void *))
-
-
-/*
-@@ LUA_IDSIZE gives the maximum size for the description of the source
-@@ of a function in debug information.
-** CHANGE it if you want a different size.
-*/
-#define LUA_IDSIZE	60
-
-
-/*
-@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
-** CHANGE it if it uses too much C-stack space. (For long double,
-** 'string.format("%.99f", 1e4932)' needs ~5030 bytes, so a
-** smaller buffer would force a memory allocation for each call to
-** 'string.format'.)
-*/
-#if defined(LUA_FLOAT_LONGDOUBLE)
-#define LUAL_BUFFERSIZE		8192
-#else
-#define LUAL_BUFFERSIZE   ((int)(0x80 * sizeof(void*) * sizeof(lua_Integer)))
-#endif
-
-/* }================================================================== */
-
-
-/*
-@@ LUA_QL describes how error messages quote program elements.
-** Lua does not use these macros anymore; they are here for
-** compatibility only.
-*/
-#define LUA_QL(x)	"'" x "'"
-#define LUA_QS		LUA_QL("%s")
-
-
-
-
-/* =================================================================== */
-
-/*
-** Local configuration. You can use this space to add your redefinitions
-** without modifying the main part of the file.
-*/
-
-
-
-
-
-#endif
-

project/vs2015/external/lua/include/lualib.h

@@ -1,58 +0,0 @@
-/*
-** $Id: lualib.h,v 1.44 2014/02/06 17:32:33 roberto Exp $
-** Lua standard libraries
-** See Copyright Notice in lua.h
-*/
-
-
-#ifndef lualib_h
-#define lualib_h
-
-#include "lua.h"
-
-
-
-LUAMOD_API int (luaopen_base) (lua_State *L);
-
-#define LUA_COLIBNAME	"coroutine"
-LUAMOD_API int (luaopen_coroutine) (lua_State *L);
-
-#define LUA_TABLIBNAME	"table"
-LUAMOD_API int (luaopen_table) (lua_State *L);
-
-#define LUA_IOLIBNAME	"io"
-LUAMOD_API int (luaopen_io) (lua_State *L);
-
-#define LUA_OSLIBNAME	"os"
-LUAMOD_API int (luaopen_os) (lua_State *L);
-
-#define LUA_STRLIBNAME	"string"
-LUAMOD_API int (luaopen_string) (lua_State *L);
-
-#define LUA_UTF8LIBNAME	"utf8"
-LUAMOD_API int (luaopen_utf8) (lua_State *L);
-
-#define LUA_BITLIBNAME	"bit32"
-LUAMOD_API int (luaopen_bit32) (lua_State *L);
-
-#define LUA_MATHLIBNAME	"math"
-LUAMOD_API int (luaopen_math) (lua_State *L);
-
-#define LUA_DBLIBNAME	"debug"
-LUAMOD_API int (luaopen_debug) (lua_State *L);
-
-#define LUA_LOADLIBNAME	"package"
-LUAMOD_API int (luaopen_package) (lua_State *L);
-
-
-/* open all previous libraries */
-LUALIB_API void (luaL_openlibs) (lua_State *L);
-
-
-
-#if !defined(lua_assert)
-#define lua_assert(x)	((void)0)
-#endif
-
-
-#endif

src/utils.c

@@ -44,6 +44,9 @@
 *
 **********************************************************************************************/
 
+#define SUPPORT_TRACELOG            // Output tracelog messages
+//#define SUPPORT_TRACELOG_DEBUG     // Avoid DEBUG messages tracing
+
 #include "utils.h"
 
 #if defined(PLATFORM_ANDROID)
@@ -65,9 +68,6 @@
 #define RRES_IMPLEMENTATION
 #include "rres.h"
 
-//#define NO_TRACELOG                 // Avoid TraceLog() output (any type)
-#define DO_NOT_TRACE_DEBUG_MSGS     // Avoid DEBUG messages tracing
-
 //----------------------------------------------------------------------------------
 // Global Variables Definition
 //----------------------------------------------------------------------------------
@@ -94,10 +94,10 @@ void TraceLog(int msgType, const char *text, ...)
 {
 #if defined(SUPPORT_TRACELOG)
     static char buffer[128];
-    int traceDebugMsgs = 1;
+    int traceDebugMsgs = 0;
     
 #if defined(SUPPORT_TRACELOG_DEBUG)
-    traceDebugMsgs = 0;
+    traceDebugMsgs = 1;
 #endif
 
     switch(msgType)