mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/memory-allocations

Browse Source 
# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h
This commit is contained in:
Alexander Bock
2020-08-05 19:06:04 +02:00
parent c472ac131e 6e9db78f40
commit b78d1dd033
29 changed files with 20 additions and 1547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgui/include/gui.h
View File

@@ -36,7 +36,6 @@
#include <modules/imgui/include/guimemorycomponent.h>
#include <modules/imgui/include/guimissioncomponent.h>
#include <modules/imgui/include/guiparallelcomponent.h>
#include <modules/imgui/include/guiperformancecomponent.h>
#include <modules/imgui/include/guipropertycomponent.h>
#include <modules/imgui/include/guishortcutscomponent.h>
#include <modules/imgui/include/guispacetimecomponent.h>
@@ -64,7 +63,7 @@ namespace openspace::gui {
namespace detail {
constexpr int nComponents() {
const int nRegularComponents = 17;
const int nRegularComponents = 16;
int totalComponents = nRegularComponents;
#ifdef OPENSPACE_MODULE_ISWA_ENABLED
@@ -107,7 +106,6 @@ public:
GuiFilePathComponent _filePath;
GuiAssetComponent _asset;
GuiGlobeBrowsingComponent _globeBrowsing;
GuiPerformanceComponent _performance;
GuiPropertyComponent _globalProperty;
GuiPropertyComponent _sceneProperty;
@@ -156,8 +154,6 @@ private:
&_joystick,
&_filePath,
&_performance,
&_help
};

57
modules/imgui/include/guiperformancecomponent.h
View File

@@ -1,57 +0,0 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2020 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_IMGUI___GUIPERFORMANCECOMPONENT___H__
#define __OPENSPACE_MODULE_IMGUI___GUIPERFORMANCECOMPONENT___H__
#include <modules/imgui/include/guicomponent.h>
#include <openspace/properties/scalar/boolproperty.h>
#include <openspace/properties/scalar/intproperty.h>
#include <memory>
namespace ghoul { class SharedMemory; }
namespace openspace::gui {
class GuiPerformanceComponent : public GuiComponent {
public:
GuiPerformanceComponent();
~GuiPerformanceComponent();
void render() override;
protected:
std::unique_ptr<ghoul::SharedMemory> _performanceMemory;
properties::IntProperty _sortingSelection;
properties::BoolProperty _sceneGraphIsEnabled;
properties::BoolProperty _functionsIsEnabled;
properties::BoolProperty _outputLogs;
};
} // namespace openspace::gui
#endif // __OPENSPACE_MODULE_IMGUI___GUIPERFORMANCECOMPONENT___H__