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

Move imgui file to its own folder

Browse Source
This commit is contained in:
Alexander Bock
2014-12-18 17:21:20 +01:00
parent e45813dd91
commit 55a3c43db4
7 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: fd9674595b...8e787753ab

2
include/openspace/engine/openspaceengine.h
View File

@@ -29,7 +29,7 @@
#include <openspace/interaction/luaconsole.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/engine/configurationmanager.h>
#include <openspace/engine/gui.h>
#include <openspace/gui/gui.h>
#include <ghoul/cmdparser/commandlineparser.h>
namespace openspace {

0
include/openspace/engine/gui.h → include/openspace/gui/gui.h
View File

6
src/CMakeLists.txt
View File

@@ -46,6 +46,12 @@ file(GLOB ENGINE_HEADER ${HEADER_ROOT_DIR}/openspace/engine/*.h)
set(OPENSPACE_HEADER ${OPENSPACE_HEADER} ${ENGINE_HEADER})
source_group(Engine FILES ${ENGINE_SOURCE} ${ENGINE_HEADER})
file(GLOB GUI_SOURCE ${SOURCE_ROOT_DIR}/gui/*.cpp)
set(OPENSPACE_SOURCE ${OPENSPACE_SOURCE} ${GUI_SOURCE})
file(GLOB GUI_HEADER ${HEADER_ROOT_DIR}/openspace/gui/*.h)
set(OPENSPACE_HEADER ${OPENSPACE_HEADER} ${GUI_HEADER})
source_group(GUI FILES ${GUI_SOURCE} ${GUI_HEADER})
file(GLOB INTERACTION_SOURCE ${SOURCE_ROOT_DIR}/interaction/*.cpp)
set(OPENSPACE_SOURCE ${OPENSPACE_SOURCE} ${INTERACTION_SOURCE})
file(GLOB INTERACTION_HEADER ${HEADER_ROOT_DIR}/openspace/interaction/*.h)

2
src/engine/gui.cpp → src/gui/gui.cpp
View File

@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <openspace/engine/gui.h>
#include <openspace/gui/gui.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/properties/property.h>

2
src/scenegraph/scenegraph.cpp
View File

@@ -31,7 +31,7 @@
#include <openspace/query/query.h>
#include <openspace/util/time.h>
#include <openspace/abuffer/abuffer.h>
#include <openspace/engine/gui.h>
#include <openspace/gui/gui.h>
#include "ghoul/logging/logmanager.h"
#include "ghoul/opengl/programobject.h"

3
src/util/spicemanager.cpp
View File

@@ -118,8 +118,7 @@ SpiceManager::KernelIdentifier SpiceManager::loadKernel(const std::string& fileP
if (hasError)
return KernelFailed;
else {
KernelInformation&& info = { path, std::move(kernelId) };
_loadedKernels.push_back(info);
_loadedKernels.push_back({ path, std::move(kernelId) });
return kernelId;
}
}