Release v5.0.0 (#27)

version 5.0.0

Author: dorin-ga

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 5.0.0
+
+### Added
+
+- **Remote Configs With JSON**: Remote Configs now support JSON values, allowing for more complex configurations.
+- **Playtime Metrics API**: Introduced new API to get total playtime and playtime in the current session.
+
 ## 4.1.1
 
 ### Added

README.md

@@ -123,7 +123,7 @@ Example:
 Example:
 
 ``` c++
- gameanalytics::GameAnalytics::initialize("<your game key>", "<your secret key");
+ gameanalytics::GameAnalytics::initialize("<your game key>", "<your secret key>");
 ```
 
 ### Send events

include/GameAnalytics/GameAnalytics.h

@@ -103,6 +103,8 @@ namespace gameanalytics
          static void endSession();
 
          static std::string getRemoteConfigsValueAsString(std::string const& key, std::string const& defaultValue = "");
+         static std::string getRemoteConfigsValueAsJson(std::string const& key);
+
 
          static bool        isRemoteConfigsReady();
          static void        addRemoteConfigsListener(const std::shared_ptr<IRemoteConfigsListener> &listener);
@@ -116,6 +118,9 @@ namespace gameanalytics
          static std::string getABTestingId();
          static std::string getABTestingVariantId();
 
+         static int64_t getElapsedSessionTime();
+         static int64_t getElapsedTimeFromAllSessions();
+
          // game state changes
          // will affect how session is started / ended
          static void onResume();
@@ -125,10 +130,9 @@ namespace gameanalytics
          static bool isThreadEnding();
 
      private:
-         static bool _endThread;
 
-        static bool isSdkReady(bool needsInitialized);
-        static bool isSdkReady(bool needsInitialized, bool warn);
-        static bool isSdkReady(bool needsInitialized, bool warn, std::string const& message);
+        static bool _endThread;
+        static bool isSdkReady(bool needsInitialized, bool warn = true, std::string const& message = "");
     };
+
 } // namespace gameanalytics

source/dependencies/miniz/miniz.c source/dependencies/miniz/GA_Zip.cppsource/dependencies/miniz/miniz.c renamed to source/dependencies/miniz/GA_Zip.cpp

@@ -219,9 +219,9 @@
 #define MINIZ_HAS_64BIT_REGISTERS 1
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+namespace gameanalytics {
+namespace utilities {
+namespace zip {
 
 // ------------------- zlib-style API Definitions.
 
@@ -919,10 +919,6 @@ mz_uint32 tdefl_get_adler32(tdefl_compressor *d);
 mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy);
 #endif // #ifndef MINIZ_NO_ZLIB_APIS
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif // MINIZ_HEADER_INCLUDED
 
 // ------------------- End of Header: Implementation follows. (If you only want the header, define MINIZ_HEADER_FILE_ONLY.)
@@ -968,10 +964,6 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64)==8 ? 1 : -1];
   #define MZ_FORCEINLINE inline
 #endif
 
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
 // ------------------- zlib-style API's
 
 mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len)
@@ -4882,12 +4874,12 @@ void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char
 
 #endif // #ifndef MINIZ_NO_ARCHIVE_APIS
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif // MINIZ_HEADER_FILE_ONLY
 
+} // namespace zip
+} // namespace utilities
+} // namespace gameanalytics
+
 /*
   This is free and unencumbered software released into the public domain.
 

source/gameanalytics/GACommon.h

@@ -85,7 +85,7 @@ namespace gameanalytics
         class GAState;
     }
 
-    constexpr const char* GA_VERSION_STR = "cpp 4.1.1";
+    constexpr const char* GA_VERSION_STR = "cpp 5.0.0";
 
     constexpr int MAX_CUSTOM_FIELDS_COUNT				 = 50;
     constexpr int MAX_CUSTOM_FIELDS_KEY_LENGTH			 = 64;

source/gameanalytics/GADevice.h

@@ -78,6 +78,7 @@ namespace gameanalytics
                 std::string _osVersion;
                 std::string _deviceModel;
                 std::string _deviceManufacturer;
+                std::string _gpu;
 
                 std::string _writablepath;
                 bool        _writablepathStatus{false};

source/gameanalytics/GAEvents.cpp

@@ -116,7 +116,8 @@ namespace gameanalytics
 
             try
             {
-                int64_t sessionLength  = state.calculateSessionLength();
+                // get session length in seconds
+                int64_t sessionLength  = state.calculateSessionLength<std::chrono::seconds>();
 
                 if(sessionLength < 0ll)
                 {

source/gameanalytics/GAHTTPApi.cpp

@@ -56,7 +56,7 @@ namespace gameanalytics
             std::string gameKey = state::GAState::getGameKey();
 
             // Generate URL
-            std::string url = remoteConfigsBaseUrl + "/" + initializeUrlPath + "?game_key=" + gameKey + "&interval_seconds=0&configs_hash=" + configsHash;
+            std::string url = remoteConfigsBaseUrl + "/" + initializeUrlPath + "?game_key=" + gameKey + "&interval_seconds=0&configs_hash=" + configsHash + "&config_vsn_supported=3";
 
             logging::GALogger::d("Sending 'init' URL: %s", url.c_str());
 

source/gameanalytics/GAHealth.cpp

@@ -24,10 +24,9 @@ namespace gameanalytics
     void GAHealth::doFpsReading(float fps)
     {
         int fpsBucket = std::round(fps);
-        if(fpsBucket >= 0 && fpsBucket < MAX_FPS_COUNT)
-        {
-            _fpsReadings[fpsBucket]++;
-        }
+        fpsBucket = std::clamp(fpsBucket, 0, MAX_FPS_VALUE);
+
+        _fpsReadings[fpsBucket]++;
     }
 
     int GAHealth::getMemoryPercent(int64_t memory)
@@ -65,6 +64,7 @@ namespace gameanalytics
         {
             utilities::addIfNotEmpty(out, "cpu_model", _cpuModel);
             utilities::addIfNotEmpty(out, "hardware",  _hardware);
+            utilities::addIfNotEmpty(out, "gpu_model", _gpuModel);
 
             if(_numCores > 0)
             {
@@ -169,7 +169,6 @@ namespace gameanalytics
                     }
                 }
             );
-
         }
     }
 }

source/gameanalytics/GAHealth.h

@@ -29,7 +29,8 @@ namespace gameanalytics
 
         protected:
 
-            static constexpr size_t MAX_FPS_COUNT      = 120 + 1;
+            static constexpr int    MAX_FPS_VALUE      = 120;
+            static constexpr size_t MAX_FPS_COUNT      = MAX_FPS_VALUE + 1;
             static constexpr size_t MAX_MEMORY_COUNT   = 100 + 1;
 
             static constexpr std::chrono::milliseconds MEMORY_TRACK_FREQ {5000};