Golf 1.18

.github/workflows/cmake.yml

@@ -32,7 +32,7 @@ jobs:
 
     - name: Install linux Dependencies
       if: runner.os == 'Linux'
-      run: sudo apt-get update && sudo apt-get install libgtk-3-dev libenet-dev libxrandr-dev libudev-dev libopenal-dev libflac-dev libvorbis-dev libopus-dev libsdl2-dev libunwind-dev libassimp-dev assimp-utils
+      run: sudo apt-get update && sudo apt-get install libtbb-dev libgtk-3-dev libenet-dev libxrandr-dev libudev-dev libopenal-dev libflac-dev libvorbis-dev libopus-dev libsdl2-dev libunwind-dev libassimp-dev assimp-utils
 
     - name: Install macOS Dependencies
       if: runner.os == 'MacOS'

crogine/CMakeLists.txt

@@ -27,6 +27,7 @@ SET(USE_OPENAL TRUE CACHE BOOL "Choose whether to use OpenAL for audio or SDL_Mi
 SET(TARGET_ANDROID FALSE CACHE BOOL "Build the library for Android devices")
 
 SET(USE_GL_41 FALSE CACHE BOOL "Use OpenGL 4.1 instead of 4.6 on desktop builds.")
+SET(USE_PARALLEL_EXECUTION TRUE CACHE BOOL "Enable parallel execution, requires compiler support")
 
 if(${TARGET_ANDROID})
   SET(${CMAKE_TOOLCHAIN_FILE} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android-arm.cmake")
@@ -58,14 +59,30 @@ if(NOT TARGET_ANDROID)
   endif()
 endif()
 
-if (msvc)
+if (MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+  if (NOT USE_PARALLEL_EXECUTION)
+    add_definitions(-DPARALLEL_GLOBAL_DISABLE)
+  endif()
 endif()
 
 if (APPLE)
-  add_definitions(-DGL_SILENCE_DEPRECATION)
+#silence opengl/openal deprecation warnings
+#plus apple clang doesn't support parallel exection policies
+  add_definitions(-DGL_SILENCE_DEPRECATION -DPARALLEL_GLOBAL_DISABLE)
 endif()
 
+#versions of gcc older than 9 don't support parallel execution policies
+if(CMAKE_COMPILER_IS_GNUCC AND
+  CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8 AND
+  USE_PARALLEL_EXECUTION)
+  SET(USE_TBB true)
+else()
+  add_definitions(-DPARALLEL_GLOBAL_DISABLE)
+endif()
+
+
+
 if (NOT BUILD_SHARED_LIBS)
   add_definitions(-DCRO_STATIC)
 else()
@@ -96,6 +113,9 @@ if(MSVC)
   find_package(DbgHelp REQUIRED)
 elseif(LINUX)
   find_package(Libunwind REQUIRED)
+  if(USE_TBB)
+    find_package(TBB REQUIRED)
+  endif()
 endif()
 
 include_directories(
@@ -148,6 +168,8 @@ if(NOT TARGET crogine)
     add_library(${PROJECT_NAME} SHARED ${PROJECT_SRC})
   endif()
 
+
+
   target_compile_definitions(${PROJECT_NAME} PUBLIC $<$<CONFIG:Debug>:CRO_DEBUG_>)
 
   target_link_libraries(${PROJECT_NAME}
@@ -166,6 +188,10 @@ if(NOT TARGET crogine)
     target_link_libraries(${PROJECT_NAME} winmm ws2_32 IPHLPAPI ${DBGHELP_LIBRARIES} shlwapi)
   elseif(LINUX)
     target_link_libraries(${PROJECT_NAME} ${LIBUNWIND_LIBRARIES})
+
+    if(USE_TBB)
+      target_link_libraries(${PROJECT_NAME} TBB::tbb)
+    endif()
   endif()
 
   target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)

crogine/include/crogine/Config.hpp

@@ -1,6 +1,6 @@
 /*-----------------------------------------------------------------------
 
-Matt Marchant 2017 - 2020
+Matt Marchant 2017 - 2024
 http://trederia.blogspot.com  
 
 crogine - Zlib license.
@@ -104,4 +104,21 @@ source distribution.
 
 #endif //CRO_STATIC
 
+//used specifically for the Systems
+//which implements parallel execution
+//this *doesn't* mean anything is thread-safe
+//outside of its defined scope, if anything 
+//it's probably worse :)
+//#define PARALLEL_GLOBAL_DISABLE
+#ifndef PARALLEL_GLOBAL_DISABLE
+#define USE_PARALLEL_PROCESSING
+#endif
+
+#ifdef USE_PARALLEL_PROCESSING
+#define EARLY_OUT return
+#else
+#define EARLY_OUT continue
+#endif
+
+
 #include <crogine/android/Android.hpp>

crogine/include/crogine/audio/AudioDevice.hpp

@@ -0,0 +1,63 @@
+/*-----------------------------------------------------------------------
+
+Matt Marchant 2024
+http://trederia.blogspot.com
+
+crogine - Zlib license.
+
+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 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
+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 as being the original software.
+
+3. This notice may not be removed or altered from any
+source distribution.
+
+-----------------------------------------------------------------------*/
+
+#pragma once
+
+#include <crogine/Config.hpp>
+
+#include <string>
+#include <vector>
+
+namespace cro
+{
+    /*!
+    \brief Provides access to the current audio device, available audio devices
+    and the ability to set a specific audio device as active.
+    */
+    class CRO_EXPORT_API AudioDevice final
+    {
+    public:
+        /*!
+        \brief Returns the name of the currently active device, if available
+        */
+        static const std::string& getActiveDevice();
+
+        /*!
+        \brief Returns a list of audio devices currently connected
+        */
+        static const std::vector<std::string>& getDeviceList();
+
+        /*!
+        \brief Attempts to set the given device as the active audio output
+        else does nothing if the given device is not available.
+        \param device The string name, retreived from getDeviceList(), to set active
+        */
+        static void setActiveDevice(const std::string&);
+    };
+}

crogine/include/crogine/core/App.hpp

@@ -260,6 +260,7 @@ namespace cro
             std::int32_t width = 800;
             std::int32_t height = 600;
             bool fullscreen = false;
+            bool exclusive = false;
             bool vsync = true;
             bool useMultisampling = false;
             glm::vec2 windowedSize = glm::vec2(0.f);

crogine/include/crogine/core/Message.hpp

@@ -150,7 +150,9 @@ namespace cro
             enum
             {
                 FullScreenToggled,
-                ScreenshotTaken //note that files are written asynchronously and may not be available when this message is received
+                ScreenshotTaken, //note that files are written asynchronously and may not be available when this message is received
+                ResumedFromSuspend,
+                AudioDeviceChanged
             }type = FullScreenToggled;
         };
 

crogine/include/crogine/core/MessageBus.hpp

@@ -1,6 +1,6 @@
 /*-----------------------------------------------------------------------
 
-Matt Marchant 2017 - 2020
+Matt Marchant 2017 - 2024
 http://trederia.blogspot.com
 
 crogine - Zlib license.
@@ -33,6 +33,10 @@ source distribution.
 
 #include <vector>
 
+#ifdef USE_PARALLEL_PROCESSING
+#include <mutex>
+#endif
+
 namespace cro
 {   
     /*!
@@ -85,12 +89,27 @@ namespace cro
         {
             if (!m_enabled) return static_cast<T*>((void*)m_pendingBuffer.data());
 
+            static_assert(sizeof(T) < 128, "MEssage size limit is 128 bytes");
+
             const auto dataSize = sizeof(T);
             static const auto msgSize = sizeof(Message);
-            CRO_ASSERT(dataSize < 128, "message size exceeds 128 bytes"); //limit custom data to 128 bytes
+            //CRO_ASSERT(dataSize < 128, "message size exceeds 128 bytes"); //limit custom data to 128 bytes
             CRO_ASSERT(m_pendingBuffer.size() - (m_inPointer - m_pendingBuffer.data()) > (dataSize + msgSize), "buffer overflow " + std::to_string(m_pendingCount)); //make sure we have enough room in the buffer
             //CRO_WARNING(m_pendingBuffer.size() - (m_inPointer - m_pendingBuffer.data()) < 128, "Messagebus buffer is heavily contended!");
 
+
+            //this is probably not ideal - the returned
+            //message is probably modified outside of the lock
+            //however what we're *really* protecting here
+            //is creation of new messages on the bus
+            //ALSO a lot of threads waiting on this will probably cause
+            //a stall - if we're smart each thread/group of threads
+            //would have their own mutexes and the message bus
+            //would do a collection from all of them each frame
+#ifdef USE_PARALLEL_PROCESSING
+            std::scoped_lock l(m_mutex);
+#endif
+
             Message* msg = new (m_inPointer)Message();
             m_inPointer += msgSize;
             msg->id = id;
@@ -129,5 +148,8 @@ namespace cro
         std::size_t m_pendingCount;
 
         bool m_enabled;
+#ifdef USE_PARALLEL_PROCESSING
+        std::mutex m_mutex;
+#endif
     };
 }

crogine/include/crogine/core/Window.hpp

@@ -1,6 +1,6 @@
 /*-----------------------------------------------------------------------
 
-Matt Marchant 2017 - 2020
+Matt Marchant 2017 - 2024
 http://trederia.blogspot.com
 
 crogine - Zlib license.
@@ -149,6 +149,22 @@ namespace cro
         */
         bool isFullscreen() const { return m_fullscreen; }
 
+        /*!
+        \brief Sets the full screen mode
+        \param exclusive If set to true the window is set to 'true' full screen
+        mode at the current resolutions when full screen mode is activated
+        else the window is set to borderless full screen at the current desktop
+        resolution.
+        This has no effect on macOS which is always borderless full screen
+        */
+        void setExclusiveFullscreen(bool exclusive) { m_exclusiveFullScreen = exclusive; }
+
+        /*!
+        \brief Returns the current full screen mode
+        \see setExclusiveFullScreen()
+        */
+        bool getExclusiveFullscreen() const { return m_exclusiveFullScreen; }
+
         /*!
         \brief Set the window position in desktop coordinates.
         \param x Horizontal position to place the window. A negative number
@@ -254,6 +270,7 @@ namespace cro
         mutable std::vector<glm::uvec2> m_resolutions;
 
         bool m_fullscreen;
+        bool m_exclusiveFullScreen;
         bool m_multisamplingEnabled;
 
         glm::uvec2 m_previousWindowSize; //restore to this if toggling full screen

crogine/include/crogine/ecs/System.hpp

@@ -1,6 +1,6 @@
 /*-----------------------------------------------------------------------
 
-Matt Marchant 2017 - 2022
+Matt Marchant 2017 - 2024
 http://trederia.blogspot.com
 
 crogine - Zlib license.

crogine/include/crogine/ecs/components/Drawable2D.hpp

@@ -112,6 +112,13 @@ namespace cro
         */
         void setBlendMode(Material::BlendMode);
 
+        /*!
+        \brief If set to true the backface culling is disabled for
+        this drawable and it will render regardless of vertex winding
+        \param sidedness True to enable double sided, false to disable
+        */
+        void setDoubleSided(bool sidedness) { m_doubleSided = sidedness; }
+
         /*!
         \brief Sets the area in local coordinates to crop this drawable.
         If this area is larger or does not overlap the local bounds then
@@ -156,6 +163,13 @@ namespace cro
         */
         Material::BlendMode getBlendMode() const;
 
+        /*!
+        \brief Returns true if this drawable is set to be rendered
+        double sided.
+        \see setDoubleSided()
+        */
+        bool getDoubleSided() const { return m_doubleSided; }
+
         /*!
         \brief Returns the current cropping area.
         \see setCroppingArea()
@@ -311,9 +325,11 @@ namespace cro
         bool m_autoCrop;
         std::int32_t m_textureUniform;
         std::int32_t m_worldUniform;
+        std::int32_t m_normalMatrixUniform;
         std::int32_t m_viewProjectionUniform;
 
         std::uint32_t m_facing;
+        bool m_doubleSided;
 
         Material::BlendMode m_blendMode;
         std::uint32_t m_primitiveType;

crogine/include/crogine/ecs/components/Model.hpp

@@ -195,6 +195,7 @@ namespace cro
         \param sub-mesh Index of the sub-mesh to retrieve.
         \returns const reference to the material if it exists
         */
+        Material::Data& getMaterialData(Mesh::IndexData::Pass pass, std::size_t submesh);
         const Material::Data& getMaterialData(Mesh::IndexData::Pass pass, std::size_t submesh) const;
 
         /*!

crogine/include/crogine/ecs/components/ParticleEmitter.hpp

@@ -1,6 +1,6 @@
 /*-----------------------------------------------------------------------
 
-Matt Marchant 2017 - 2023
+Matt Marchant 2017 - 2024
 http://trederia.blogspot.com
 
 crogine - Zlib license.
@@ -180,7 +180,7 @@ namespace cro
         float m_currentTimestamp;
         float m_emissionTimestamp;
 
-        bool m_pendingUpdate;
+        //bool m_pendingUpdate;
         std::uint64_t m_renderFlags;
 
         std::int32_t m_releaseCount;