mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-21 19:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,158 Commits 81 Branches 46 Tags
ddc9ef1bc56ed04ef84bf99fc906ea8558892791
Commit Graph

805 Commits

Author SHA1 Message Date
Alexander Bock
ab192959c5 Position frame number rendering correctly on MacOS 
Use more efficient drawing method
Small style fixes
 2017-05-09 10:58:28 +01:00
Alexander Bock
fdd5a98bcd Render shutdown information correctly on MacOS 2017-05-09 10:44:20 +01:00
Alexander Bock
63d607281a Update SGCT repository 
Add property to toggle date rendering independent from rendering statistics
 2017-05-09 10:30:35 +01:00
Alexander Bock
da3e912026 Remove warnings on MacOS in Clang 2017-04-25 19:12:42 -04:00
Emil Axelsson
4b38b33e18 Clean up code for planet radius and bounding sphere calculation (#289) 
- Remove some power scaled coordaintes.
- Remove spice dependency from sphere geometry.
- Remove dead code.
 2017-04-18 09:58:27 +02:00
Alexander Bock
dd32a812e1 Change tabs to spaces 2017-04-17 15:00:15 -04:00
Alexander Bock
c53bbf14be Add property and configuration option to disable the scene tag on a master node (closing #247) 2017-04-17 10:55:37 -04:00
Gene Payne
4a312c70b8 Merge branch 'master' into feature/grouping 2017-04-13 11:23:15 -06:00
GPayne
7a7fef239c Made changes according to pull request feedback 2017-04-13 11:12:26 -06:00
GPayne
d66561a1d3 Added option for single or multiple tags in a scenegraph node 2017-04-10 15:05:06 -06:00
Alexander Bock
9f3bbe324d Remove warnings 2017-04-06 23:19:23 -04:00
GPayne
bcdd906ad7 Some minor changes and added tag support to screenspacerenderable 2017-03-31 15:14:00 -06:00
GPayne
95f4b249b9 Fixed problem exiting before addressing all tags. Added tags to renderable class. 2017-03-22 14:10:53 -06:00
Emil Axelsson
b06864eefe Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-03-16 16:35:29 +01:00
Emil Axelsson
ca6348194e Clean up scene loading 2017-03-14 13:40:18 +01:00
Alexander Bock
bcf92804b6 Updating Ghoul repository 
Updating SGCT repository
Removing compiler warnings
 2017-03-10 09:32:16 -05:00
Alexander Bock
f3ad9e8d6e Set accuracy of simulation increment to three significant digits 2017-03-07 10:45:26 -05:00
Emil Axelsson
7da999c332 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl
 2017-03-07 10:57:50 +01:00
Emil Axelsson
d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume 
Conflicts:
	src/engine/openspaceengine.cpp
 2017-03-03 18:08:29 +01:00
Alexander Bock
9d30d3323b Update Ghoul repository 
Adapt to changed signature of ghoul_assert macro
 2017-03-03 10:55:20 -05:00
Alexander Bock
1689dc4047 Move the PropertyOwner name specification into the constructor and adjust accordingly 2017-03-02 18:25:13 -05:00
Alexander Bock
c12bd7182b Some cleanup of ModuleEngine 
Some cleanup of SettingsEngine
Some cleanup of SyncEngine
 2017-03-02 17:24:44 -05:00
Alexander Bock
d6b5bb753b - Some cleanup of LuaConsole 
- Moved dedicated Lua commands into a visible property
  - Disallow non-ASCII characters
- Remove unused KeyboardController
- Remove unused DeviceIdentifier
- Some cleanup of LogFactory
  - Move and use documentation into the class
 2017-03-02 14:27:18 -05:00
Emil Axelsson
c2fa08716b Cleanup 2017-03-02 18:53:05 +01:00
Emil Axelsson
17cc48621a Fix inside volume rendering crash on certain platforms 2017-03-02 18:20:05 +01:00
Emil Axelsson
686fec4f9d Add Spice kernels for Mercury and Saturn magnetosphere rendering, implement inside volume rendering for kameleon volumes 
Conflicts:
	data/scene/mercury/mercury.mod
	data/scene/saturn/saturn/saturn.mod
 2017-03-02 18:20:02 +01:00
Alexander Bock
2f2fa3b031 Update Ghoul repository to have the factory return unique_ptrs 
Adjust accordingly
 2017-03-01 22:03:48 -05:00
Alexander Bock
8fd60ce8e6 - Remove documentation.h include and replace with forward declaration 
- Move Documentation struct into documentation namespace
 2017-03-01 18:13:15 -05:00
Alexander Bock
55f002ad6f Move the disabling of the rendering on the master into the RenderEngine 
instead of specifying it in the OpenSpaceEngine
 2017-03-01 10:39:29 -05:00
Alexander Bock
3e2c56c940 Steps towards moving dedicated lua functions into properties 2017-02-28 23:15:11 -05:00
Alexander Bock
78f2f0a35e Some more cleanup of RenderEngine 2017-02-27 16:40:50 -05:00
Alexander Bock
283c83e37c Removing code analysis warnings 
Start cleaning RenderEngine
 2017-02-26 23:45:39 -05:00
Alexander Bock
bc75334eb4 Use exceptions instead of success return values for initialize and 
create methods
 2017-02-25 18:08:53 -05:00
Alexander Bock
6c4efc4eec Move OpenSpaceEngine::isMaster method into WindowWrapper class 2017-02-25 11:29:28 -05:00
Alexander Bock
965cf6bd9a Fix crash that occurs if there is an error in the SGCT configuration file 2017-02-22 15:31:59 -05:00
Alexander Bock
efe205c209 - Add initial tracing calls adapting to new Ghoul change of adding a 
loglevel of ‘Trace’
- Adapt js and css files to show trace files in log
 2017-02-14 18:10:28 -05:00
Alexander Bock
23ea86949f Updated check_style_guide to test for include guards and copyright 
notices
 - Fix include guards
 - Fix copyright header indentation
 - Update copyright years
 2017-02-09 23:55:39 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017 
Update Ghoul repository
Remove libgdal link
 2017-02-06 18:02:01 -05:00
Emil Axelsson
4751ce36c4 Refactor scene graph: Move scene loading to separate class. 2016-12-30 17:08:50 +01:00
Alexander Bock
aa2ac511ff Adapt to Ghoul changes of moving LogLevel out of LogManager 2016-12-14 22:59:22 +01:00
Emil Axelsson
ad3921fda5 Remove unused postRender method for scene graph nodes and renderables 2016-12-14 14:14:53 +01:00
Alexander Bock
2a3b532745 Add display of double precision properties to ImGui 
Do not show date text when render information is hidden
Add Utah WMS files
 2016-12-09 09:04:53 +01:00
Alexander Bock
683fc8ee53 Pr/trails (#170) 
* Implement new RenderableTrails as abstract base class
  - Implement RenderableTrailsOrbit and RenderableTrailsTrajectory as concrete instances
Remove old RenderableTrails and RenderableTrailsNew classes
Adapt mod files to the new structure

* Addressed Pull Request comments
 2016-11-23 10:35:46 +01:00
Alexander Bock
e543163612 Updating Ghoul reference 
Adapt to the API changes
 2016-11-14 14:45:26 +01:00
Alexander Bock
572257d3b0 Move the rendertime into a property and remove the toggleFrametimeType 
Make OptionProperty work in Radio mode
Rename DROPDOWN and RADIO to Dropdown and Radio
 2016-11-06 22:15:52 +01:00
Alexander Bock
c469be26c3 Make toggling the performance measurements a BoolProperty of RenderEngine 2016-11-06 02:00:42 +01:00
Alexander Bock
4597bde05a Cleaned up RenderableRings 
Some minor performance improvements
 2016-10-29 22:15:17 +02:00
Emil Axelsson
cb3ff96e1a Pass window size as uniform instead of shader program constant. Fixes #143 2016-10-28 10:26:23 +02:00
Alexander Bock
542f92e768 Add a fix to the window resolution for Retina displays 
Add a new setting to the ConfigurationManager that can specify whether to scale the onscreen text by window size or resolution
 2016-10-18 18:52:30 +02:00
Emil Axelsson
e21b69cab8 Remove sgct dependency from renderengine 2016-10-10 17:46:26 +02:00