601 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Bock	90eac194dc	Initial work on performance measuring	2014-12-09 01:41:42 +01:00
Alexander Bock	31191106fc	Rebind keys to toggle GUI with F1 key	2014-12-08 20:26:13 +01:00
Alexander Bock	d8f7bb746a	Started cleaning OpenSpaceEngine	2014-12-08 18:30:18 +01:00
Alexander Bock	ad9ba2404d	Merge branch 'gui' into develop	2014-12-08 12:58:32 +01:00
Alexander Bock	e72515ab77	Update ghoul version	2014-12-08 12:50:12 +01:00
Alexander Bock	7f8fa6add3	Remove warning in Windows	2014-12-08 12:44:29 +01:00
Alexander Bock	56e1187ee7	Always create the GUI element but make it switchable via scripting	2014-12-08 12:41:31 +01:00
Alexander Bock	9cd435f3e3	Fix imgui configuration definition	2014-12-07 00:39:16 +01:00
Alexander Bock	2c85d53164	Made GUI optional	2014-12-06 18:33:11 +01:00
Alexander Bock	40415a2eee	Updated GUI names	2014-12-06 17:51:39 +01:00
Alexander Bock	7fc33948ca	Remove error logging from PowerScaledSphere	2014-12-06 17:51:25 +01:00
Alexander Bock	afa2d4d6a9	More work on GUI elements ... Create GUI for some Properties	2014-12-06 17:20:59 +01:00
Alexander Bock	4e65aaafe2	Add method to get fully qualified id to Propertys	2014-12-06 17:19:25 +01:00
Alexander Bock	9a9c0c0237	Give PropertyOwner a field to remember its owner	2014-12-06 17:18:49 +01:00
Alexander Bock	8719f98a23	Allow access to minimum/maximum values of NumericalPropertys	2014-12-06 17:18:05 +01:00
Alexander Bock	98aeeb7d13	Merge branch 'develop' into gui	2014-12-06 12:51:26 +01:00
Alexander Bock	4f688a537e	Add typedef for TemplateProperty	2014-12-06 12:51:11 +01:00
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