Commit Graph

584 Commits

Author SHA1 Message Date
Alexander Bock
0854aa5bcb Added imgui library 2014-12-06 12:48:56 +01:00
Alexander Bock
0a0543cc94 More callbacks implemented 2014-12-06 12:46:52 +01:00
Alexander Bock
9f7e1581de Allow unique input to the GUI
Move GUI from RenderEngine to OpenSpace engine
2014-12-06 12:33:06 +01:00
Alexander Bock
a253ca3441 Merge branch 'develop' into gui 2014-12-06 02:25:04 +01:00
Alexander Bock
58b814e6f2 Updated the cloc language definition 2014-12-06 01:56:30 +01:00
Alexander Bock
d4072a7002 Updating Ghoul version 2014-12-06 01:30:03 +01:00
Alexander Bock
bf08b075a4 Try fixing Jenkins build 2014-12-06 01:29:54 +01:00
Alexander Bock
4ffb5cb0d3 Update cloc language definition 2014-12-06 01:19:57 +01:00
Alexander Bock
a03523aa4f First version of imgui integration 2014-12-06 00:32:17 +01:00
Alexander Bock
4e4de3f40e Changing the hardcoded bv-color map to a transfer function based map 2014-12-05 22:58:14 +01:00
Alexander Bock
d3e16a0437 Apply changes to texture reading 2014-12-05 21:01:54 +01:00
Alexander Bock
5b072aa562 Set default logging level back to 'Debug' 2014-12-05 17:55:34 +01:00
Jonas Strandstedt
645da3630f Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-05 16:52:53 +01:00
Jonas Strandstedt
5e94004a01 Removed Spice source submodule and added precompiled libraries 2014-12-05 16:52:13 +01:00
Alexander Bock
d9fbf7c5fd Adding capabilities to configure the LogLevel and ImmediateFlush of the LogManager 2014-12-05 16:43:54 +01:00
Alexander Bock
cf53b5c1b0 Let the LuaConsole use a permanent cached file for the history 2014-12-05 16:43:16 +01:00
Alexander Bock
a0e927da14 Renamed Lua function printImage to takeScreenshot
Fixed takeScreenshot to actually take a screenshot
2014-12-05 16:14:30 +01:00
Alexander Bock
805123d54d Update cloc definition to catch more GLSL files 2014-12-05 14:35:45 +01:00
Alexander Bock
50076e4640 Fixing the flickering of the star rendering (#66) 2014-12-05 14:13:37 +01:00
Alexander Bock
2b79b85124 Started bugfix for renderable stars flickering bug 2014-12-05 11:56:43 +01:00
jonasstrandstedt
99d075f727 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-04 23:28:15 +01:00
jonasstrandstedt
11e867aaf1 Fixed bug that causes crash if Focus node wasn't found 2014-12-04 23:27:18 +01:00
Alexander Bock
5497f25725 Added the selection property to the RenderableConstellationBounds 2014-12-04 23:05:51 +01:00
Alexander Bock
08378888a6 Fixed the SelectionProperty 2014-12-04 23:04:54 +01:00
Alexander Bock
4ba81a5d6c Add SelectionProperty 2014-12-04 21:29:25 +01:00
Alexander Bock
612e48455d Update ghoul reference 2014-12-04 19:20:55 +01:00
Alexander Bock
da80fc7251 Merge branch 'feature/constallationbounds' into develop 2014-12-04 19:19:50 +01:00
Alexander Bock
fe9db28310 Finished with current version of ConstellationBounds 2014-12-04 19:12:31 +01:00
Alexander Bock
89890f66ed Use correct openspace-data 2014-12-04 18:38:17 +01:00
Alexander Bock
3f35b0a948 More optimizations for RenderableConstellationBounds 2014-12-04 18:37:15 +01:00
Alexander Bock
38b1c00d3d Fix RenderableConstellationBounds name
Make rendering more efficient
2014-12-04 18:05:13 +01:00
Alexander Bock
e735e8f90a Update glslLangDef file 2014-12-04 16:55:26 +01:00
Alexander Bock
40c537f858 Add a definition file to make cloc understand glsl files 2014-12-04 16:30:32 +01:00
Alexander Bock
0d48766f7d Move the cmake include files from ext to support/cmake 2014-12-04 16:30:16 +01:00
Alexander Bock
aa27a0f882 Move the doxygen files from doxygen to support/doxygen 2014-12-04 16:29:39 +01:00
Alexander Bock
b2cb6fb584 Change some more code in preparation of the new SGCT version 2014-12-04 16:28:49 +01:00
Jonas Strandstedt
fcf4bd622a Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-04 14:37:27 +01:00
Jonas Strandstedt
ba4a55fd88 Removed references to OpenCL 2014-12-04 14:36:55 +01:00
Jonas Strandstedt
d7487f601c OS X compile fixes 2014-12-04 11:20:28 +01:00
Alexander Bock
5d168c18e5 First working version 2014-12-04 00:55:25 +01:00
Alexander Bock
1a590f83e0 Initial commit of constallation bounds 2014-12-04 00:18:37 +01:00
Alexander Bock
cb526c7736 Update ghoul repository 2014-12-03 20:39:16 +01:00
Alexander Bock
dedb825fcf Added missing implementation to retrieve non-const renderable 2014-12-03 18:06:54 +01:00
Alexander Bock
8c2dfb13bb Enable querying for Renderables in query.h 2014-12-03 17:19:18 +01:00
Alexander Bock
14051455a5 Fix error that appears when creating directories on first start 2014-12-03 17:19:01 +01:00
Jonas Strandstedt
47c68ade3c Small fix for finding the SGCT configuration path 2014-12-03 16:42:22 +01:00
Jonas Strandstedt
279e9e82ba Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-03 16:31:16 +01:00
Jonas Strandstedt
4ff9f08473 Changes to conform to new ghoul ProgramObject::Build interface 2014-12-03 16:30:25 +01:00
Alexander Bock
36d3b6bf74 Be able to set the SGCT configuration file using the commandline arguments 2014-12-03 16:09:24 +01:00
Alexander Bock
aba4d6024d Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2014-12-03 15:42:51 +01:00