Merge pull request #901 from Pax1601/main

Main
Pax1601 · Jul 23, 2024 · 119a6f6 · 119a6f6
2 parents a8595a9 + 3e22247
commit 119a6f6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/backend/logger/src/logger.cpp b/backend/logger/src/logger.cpp
@@ -27,17 +27,18 @@ Logger* Logger::GetLogger()
 void Logger::setDirectory(string newDirPath)
 {
     m_dirPath = newDirPath;
+    Clear();
 }
 
 void Logger::Clear()
 {
     lock_guard<mutex> guard(mutexLock);
     try {
-        m_Logfile.open((m_dirPath + m_sFileName).c_str(), ios::out | std::ios::trunc);
+        m_Logfile.open((m_dirPath + m_sFileName).c_str(), ios::out | ios::trunc);
     }
     catch (...) {
         std::filesystem::path m_dirPath = std::filesystem::temp_directory_path();
-        m_Logfile.open((m_dirPath.string() + m_sFileName).c_str(), ios::out | std::ios::trunc);
+        m_Logfile.open((m_dirPath.string() + m_sFileName).c_str(), ios::out | ios::trunc);
     }
     m_Logfile << "Creating a new log instance\n";
     m_pThis->Close();

diff --git a/scripts/lua/backend/OlympusCameraControl.lua b/scripts/lua/backend/OlympusCameraControl.lua
@@ -5,6 +5,7 @@ local _prevLuaExportStop = LuaExportStop
 local server = nil
 local port = 3003
 local headers = "Access-Control-Allow-Private-Network: true\r\nAccess-Control-Allow-Origin: *\r\nAccess-Control-Allow-Methods: *\r\nAccess-Control-Allow-Headers: *\r\nAccess-Control-Max-Age: 86400\r\nVary: Accept-Encoding, Origin\r\n\r\n"
+local positionToSet = nil
 
 function startTCPServer()
     log.write('OLYMPUSCAMERACONTROL.EXPORT.LUA', log.INFO, 'Starting TCP Server')
@@ -35,8 +36,6 @@ function receiveTCP()
 
             local acc = ""
             local data = ""
-
-            log.write('OLYMPUSCAMERACONTROL.EXPORT.LUA', log.INFO, 'CONNECTION')
 
             -- Start receiving data, accumulate it in acc
             while data ~= nil do
@@ -139,7 +138,9 @@ function setCameraPosition(position)
         z = {x = 0, y = 0, z = 1},	                
         p = {x = point.x, y = altitude, z = point.z}   
     }
-    LoSetCameraPosition(pos)
+
+    -- Store the value in a variable so that it can be set at the next frame
+    positionToSet = pos
 
     return '{"northRotation": ' .. rotation .. '}'
 end
@@ -160,6 +161,11 @@ LuaExportStart = function()
 end
 
 LuaExportBeforeNextFrame = function()
+    if positionToSet ~= nil then
+        LoSetCameraPosition(positionToSet)
+        positionToSet = nil
+    end
+
     receiveTCP()
 
 	-- call original