Merge pull request #110 from RobLoach/update

RobLoach · web-flow · commit 78adb8c4b8fd · 2021-01-18T19:02:50.000-05:00
v3.5.0-beta2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v3.5.0-beta2] - Unreleased
+## [v3.5.0-beta2] - 2021-01-18
 ### Fixed
 - `Font.charsPadding` loading
 ### Removed
diff --git a/LICENSE b/LICENSE
@@ -1,13 +1,13 @@
-Copyright (c) 2019-2020 Rob Loach (@RobLoach)
+Copyright (c) 2019-2021 Rob Loach (@RobLoach)
 
-This software is provided "as-is", without any express or implied warranty. In no event 
+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
diff --git a/README.md b/README.md
@@ -13,12 +13,12 @@ int main() {
 	int screenWidth = 800;
 	int screenHeight = 450;
 
-	raylib::Window w(screenWidth, screenHeight, "raylib-cpp - basic window");
+	raylib::Window window(screenWidth, screenHeight, "raylib-cpp - basic window");
 	raylib::Texture logo("raylib_logo.png");
 
 	SetTargetFPS(60);
 
-	while (!w.ShouldClose())
+	while (!window.ShouldClose())
 	{
 		BeginDrawing();
 
@@ -28,7 +28,7 @@ int main() {
 
 		// Object methods.
 		logo.Draw(
-			screenWidth / 2 - logo.GetWidth() / 2,
+            screenWidth / 2 - logo.GetWidth() / 2,
 			screenHeight / 2 - logo.GetHeight() / 2);
 
 		EndDrawing();
@@ -154,7 +154,7 @@ ImageResize(&cat, 150, 200);
 
 // raylib-cpp
 raylib::Image cat("cat.png");
-cat.Crop((Rectangle){ 100, 10, 280, 380 })
+cat.Crop(100, 10, 280, 380)
    .FlipHorizontal()
    .Resize(150, 200);
 ```
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -11,6 +11,7 @@ if (NOT raylib_FOUND)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/raylib ${CMAKE_CURRENT_SOURCE_DIR}/../vendor/raylib)
 endif()
 
+# Find all examples
 foreach(example_dir ${example_dirs})
     file(GLOB sources ${example_dir}/*.cpp)
     list(APPEND example_sources ${sources})
@@ -20,7 +21,7 @@ foreach(example_dir ${example_dirs})
     list(APPEND example_resources ${resources})
 endforeach()
 
-# Do each example
+# Compile all examples
 foreach(example_source ${example_sources})
     # Create the basename for the example
     get_filename_component(example_name ${example_source} NAME)
@@ -37,4 +38,5 @@ foreach(example_source ${example_sources})
 
 endforeach()
 
+# Copy all the resources
 file(COPY ${example_resources} DESTINATION "resources/")
diff --git a/examples/audio/audio_music_stream.cpp b/examples/audio/audio_music_stream.cpp
@@ -17,7 +17,7 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [audio] example - music playing (streaming)");
+    raylib::Window window(screenWidth, screenHeight, "raylib [audio] example - music playing (streaming)");
 
     raylib::AudioDevice audio;              // Initialize audio device
 
@@ -32,7 +32,7 @@ int main() {
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/audio/audio_sound_loading.cpp b/examples/audio/audio_sound_loading.cpp
@@ -17,7 +17,7 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [audio] example - sound loading and playing");
+    raylib::Window window(screenWidth, screenHeight, "raylib [audio] example - sound loading and playing");
 
     raylib::AudioDevice audiodevice;      // Initialize audio device
 
@@ -28,7 +28,7 @@ int main() {
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/core/core_3d_camera_first_person.cpp b/examples/core/core_3d_camera_first_person.cpp
@@ -19,7 +19,7 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [core] example - 3d camera first person");
+    raylib::Window window(screenWidth, screenHeight, "raylib [core] example - 3d camera first person");
     raylib::Color background(RAYWHITE);
 
     // Define the camera to look into our 3d world (position, target, up vector)
@@ -48,7 +48,7 @@ int main() {
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())                // Detect window close button or ESC key
+    while (!window.ShouldClose())                // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/core/core_basic_window.cpp b/examples/core/core_basic_window.cpp
@@ -27,13 +27,13 @@ int main() {
     int screenWidth = 800;
     int screenHeight = 450;
     raylib::Color textColor(LIGHTGRAY);
-    raylib::Window w(screenWidth, screenHeight, "raylib [core] example - basic window");
+    raylib::Window window(screenWidth, screenHeight, "raylib [core] example - basic window");
 
     SetTargetFPS(60);
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/core/core_drop_files.cpp b/examples/core/core_drop_files.cpp
@@ -19,15 +19,15 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [core] example - drop files");
+    raylib::Window window(screenWidth, screenHeight, "raylib [core] example - drop files");
 
     std::vector<std::string> droppedFiles;
 
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/core/core_input_mouse.cpp b/examples/core/core_input_mouse.cpp
@@ -17,7 +17,7 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [core] example - mouse input");
+    raylib::Window window(screenWidth, screenHeight, "raylib [core] example - mouse input");
 
     raylib::Vector2 ballPosition(-100.0f, -100.0f);
     raylib::Color background(RAYWHITE);
@@ -28,7 +28,7 @@ int main() {
     //---------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/core/core_random_values.cpp b/examples/core/core_random_values.cpp
@@ -17,7 +17,7 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [core] example - generate random values");
+    raylib::Window window(screenWidth, screenHeight, "raylib [core] example - generate random values");
 
     int framesCounter = 0;          // Variable used to count frames
 
@@ -27,7 +27,7 @@ int main() {
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/core/core_world_screen.cpp b/examples/core/core_world_screen.cpp
@@ -17,7 +17,7 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [core] example - 3d camera free");
+    raylib::Window window(screenWidth, screenHeight, "raylib [core] example - 3d camera free");
 
     // Define the camera to look into our 3d world
     raylib::Camera camera(
@@ -36,7 +36,7 @@ int main() {
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())        // Detect window close button or ESC key
+    while (!window.ShouldClose())        // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/models/models_billboard.cpp b/examples/models/models_billboard.cpp
@@ -17,7 +17,7 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [models] example - drawing billboards");
+    raylib::Window window(screenWidth, screenHeight, "raylib [models] example - drawing billboards");
 
     // Define the camera to look into our 3d world
     raylib::Camera camera(
@@ -37,7 +37,7 @@ int main() {
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())            // Detect window close button or ESC key
+    while (!window.ShouldClose())            // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/physics/physics_demo.cpp b/examples/physics/physics_demo.cpp
@@ -29,7 +29,7 @@ int main(void)
     const int screenHeight = 450;
 
     SetConfigFlags(FLAG_MSAA_4X_HINT);
-    raylib::Window w(screenWidth, screenHeight, "Physac [raylib-cpp] - Physics demo");
+    raylib::Window window(screenWidth, screenHeight, "Physac [raylib-cpp] - Physics demo");
 
     // Physac logo drawing position
     int logoX = screenWidth - MeasureText("Physac", 30) - 10;
@@ -51,7 +51,7 @@ int main(void)
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/shapes/shapes_collision_area.cpp b/examples/shapes/shapes_collision_area.cpp
@@ -20,7 +20,7 @@ int main(void)
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [shapes] example - collision area");
+    raylib::Window window(screenWidth, screenHeight, "raylib [shapes] example - collision area");
 
     // Box A: Moving box
     raylib::Rectangle boxA(10, GetScreenHeight()/2 - 50, 200, 100);
@@ -41,7 +41,7 @@ int main(void)
     //----------------------------------------------------------
 
     // Main game loop
-    while (!WindowShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //-----------------------------------------------------
diff --git a/examples/shapes/shapes_logo_raylib.cpp b/examples/shapes/shapes_logo_raylib.cpp
@@ -17,15 +17,15 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [shapes] example - raylib logo using shapes");
+    raylib::Window window(screenWidth, screenHeight, "raylib [shapes] example - raylib logo using shapes");
     raylib::Color foreground = raylib::Color(0, 68, 130);
     raylib::Color background = RAYWHITE;
 
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/text/text_font_loading.cpp b/examples/text/text_font_loading.cpp
@@ -27,7 +27,7 @@ int main() {
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [text] example - font loading");
+    raylib::Window window(screenWidth, screenHeight, "raylib [text] example - font loading");
 
     // Define characters to draw
     // NOTE: raylib supports UTF-8 encoding, following list is actually codified as UTF8 internally
@@ -44,11 +44,11 @@ int main() {
 
     bool useTtf = false;
 
-    w.SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
+    window.SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
@@ -58,7 +58,7 @@ int main() {
 
         // Draw
         //----------------------------------------------------------------------------------
-        w.BeginDrawing();
+        window.BeginDrawing();
 
             ClearBackground(RAYWHITE);
 
diff --git a/examples/text/text_font_spritefont.cpp b/examples/text/text_font_spritefont.cpp
@@ -20,7 +20,7 @@ int main(void)
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [text] example - sprite fonts usage");
+    raylib::Window window(screenWidth, screenHeight, "raylib [text] example - sprite fonts usage");
 
     std::string msg1 = "THIS IS A custom SPRITE FONT...";
     std::string msg2 = "...and this is ANOTHER CUSTOM font...";
@@ -44,7 +44,7 @@ int main(void)
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/text/text_raylib_fonts.cpp b/examples/text/text_raylib_fonts.cpp
@@ -25,7 +25,7 @@ int main() {
     int screenWidth = 800;
     int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [text] example - raylib fonts");
+    raylib::Window window(screenWidth, screenHeight, "raylib [text] example - raylib fonts");
     raylib::Color background(RAYWHITE);
     raylib::Color textColor(DARKGRAY);
 
@@ -72,7 +72,7 @@ int main() {
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/textures/textures_bunnymark.cpp b/examples/textures/textures_bunnymark.cpp
@@ -53,7 +53,7 @@ int main(void)
     const int screenWidth = 800;
     const int screenHeight = 450;
 
-    raylib::Window w(screenWidth, screenHeight, "raylib [textures] example - bunnymark");
+    raylib::Window window(screenWidth, screenHeight, "raylib [textures] example - bunnymark");
 
     // Load bunny texture
     raylib::Texture2D texBunny("resources/wabbit_alpha.png");
@@ -64,7 +64,7 @@ int main(void)
     //--------------------------------------------------------------------------------------
 
     // Main game loop
-    while (!w.ShouldClose())    // Detect window close button or ESC key
+    while (!window.ShouldClose())    // Detect window close button or ESC key
     {
         // Update
         //----------------------------------------------------------------------------------
diff --git a/examples/textures/textures_image_drawing.cpp b/examples/textures/textures_image_drawing.cpp
diff --git a/examples/textures/textures_image_loading.cpp b/examples/textures/textures_image_loading.cpp
diff --git a/include/Functions.hpp b/include/Functions.hpp
diff --git a/include/Image.hpp b/include/Image.hpp
diff --git a/include/Matrix.hpp b/include/Matrix.hpp
diff --git a/include/Mesh.hpp b/include/Mesh.hpp
diff --git a/package.json b/package.json
diff --git a/projects/CMake/main.cpp b/projects/CMake/main.cpp
diff --git a/tests/catch.hpp b/tests/catch.hpp
