mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-03-13 17:09:05 -05:00
fixed Alex' bug!!
Added string specialization to template functions for syncbuffer class
This commit is contained in:
@@ -28,6 +28,7 @@
|
||||
#include <openspace/rendering/renderengine.h>
|
||||
#include <ghoul/misc/sharedmemory.h>
|
||||
#include <imgui.h>
|
||||
#include <algorithm>
|
||||
|
||||
namespace {
|
||||
const std::string _loggerCat = "GuiPerformanceComponent";
|
||||
@@ -79,7 +80,8 @@ void GuiPerformanceComponent::render() {
|
||||
ghoul::SharedMemory::exists(RenderEngine::PerformanceMeasurementSharedData))
|
||||
{
|
||||
ImGui::SliderFloat2("Min values, max Value", _minMaxValues, 0.f, 10000.f);
|
||||
_minMaxValues[1] = std::max(_minMaxValues[0], _minMaxValues[1]);
|
||||
_minMaxValues[1] = fmaxf(_minMaxValues[0], _minMaxValues[1]);
|
||||
|
||||
|
||||
if (!_performanceMemory)
|
||||
_performanceMemory = new ghoul::SharedMemory(RenderEngine::PerformanceMeasurementSharedData);
|
||||
|
||||
@@ -184,7 +184,7 @@ ScriptEngine::ScriptEngine()
|
||||
}
|
||||
|
||||
ScriptEngine::~ScriptEngine() {
|
||||
deinitialize();
|
||||
//deinitialize();
|
||||
}
|
||||
|
||||
bool ScriptEngine::initialize() {
|
||||
@@ -615,15 +615,14 @@ void ScriptEngine::deserialize(SyncBuffer* syncBuffer){
|
||||
}
|
||||
|
||||
void ScriptEngine::postSynchronizationPreDraw(){
|
||||
|
||||
}
|
||||
|
||||
void ScriptEngine::preSynchronization(){
|
||||
if (!_currentSyncedScript.empty()){
|
||||
runScript(_currentSyncedScript);
|
||||
_currentSyncedScript.clear();
|
||||
}
|
||||
}
|
||||
|
||||
void ScriptEngine::preSynchronization(){
|
||||
|
||||
_mutex.lock();
|
||||
|
||||
if (!_queuedScripts.empty()){
|
||||
|
||||
Reference in New Issue
Block a user