mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-12 14:40:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,957 Commits 83 Branches 46 Tags
11fbff5fbc87912d54f8f3424d199a3ef9476faf
Commit Graph

381 Commits

Author SHA1 Message Date
Alexander Bock
11fbff5fbc Reduce the dependency of libOpenSpace on modules 
- Enable module callbacks for OpenSpaceEngine
 - Add OpenSpaceModule function that returns a Lua library
 2017-02-16 16:43:34 -05:00
Alexander Bock
8167228d69 Add global try-catch block around main function 
Add additional LDEBUG and LTRACE for debugging
 2017-02-16 12:30:58 -05:00
Alexander Bock
729bffb0f9 Improve SpecificationError reporting 
Fix spelling error in ModuleEngine
 2017-02-14 18:11:20 -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
a6c422c38e Fix runtime error with moving classes from base to space module 
Add additional logging information to initialization
 2017-02-08 14:42:28 -05:00
Alexander Bock
5f98ec2ca9 Update Ghoul repository 
Make changes to accommodate the new Lua state class
 2017-02-07 17:02:43 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017 
Update Ghoul repository
Remove libgdal link
 2017-02-06 18:02:01 -05:00
Alexander Bock
aa2ac511ff Adapt to Ghoul changes of moving LogLevel out of LogManager 2016-12-14 22:59:22 +01:00
Emil Axelsson
4b688fd149 Move Rotation and Scale factories from base module to OpenSpace core 2016-12-14 14:27:12 +01:00
Alexander Bock
d139dd2d22 Clean include guards in OpenSpace core 
Remove unused files
 2016-12-09 13:54:22 +01:00
Alexander Bock
b3be4180de Clean data/scene folder; remove lodesritest and restructure lodglobes folders 
Fix various issues in mod files
Remove backslash from file paths in StringProperty
 2016-12-09 10:21:17 +01:00
Alexander Bock
341bc8b105 Merge branch 'develop' into feature/globebrowsing 
# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h
 2016-12-03 01:32:23 +01:00
Alexander Bock
c515bbfd0f Redesign the ScriptScheduler to not copy scripts on return 
Fix earth.mod file
 2016-12-03 00:51:32 +01:00
kalbl
a617261bde Solve conflict 2016-11-23 13:34:38 +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
db923209c3 Show PerformanceMeasurements independently of the Gui visibility 
Replace settings in performance measurements with properties
 2016-11-22 10:16:17 +01:00
Alexander Bock
e2305654bc Correctly deinitialize default FontRenderer 
Use std::accumulate in property JSON generation
 2016-11-14 17:28:59 +01:00
Alexander Bock
5f0623e964 Compile fix for new Ghoul version 
Make FactoryDocumentation optional
 2016-11-13 19:54:55 +01:00
kalbl
d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
Alexander Bock
70af0f0073 Add an option to the configuration manager to append the scene name to the cache directory (closing #159) 2016-11-07 13:39:01 +01:00
Alexander Bock
c469be26c3 Make toggling the performance measurements a BoolProperty of RenderEngine 2016-11-06 02:00:42 +01:00
Alexander Bock
fd98f311d3 Some cleanup of scene files 
Exceptions in preInitialization scripts no long crash the application
 2016-10-31 11:43:36 +01:00
Alexander Bock
c880ee421a Make OpenSpaceModule able to report their version number 2016-10-29 23:13:37 +02:00
Alexander Bock
c7809cb6cf Some initial work to make OpenGL 3.3 work 
Make OpenSpace not crash if the FontRenderer shader cannot be compiled
 2016-10-29 16:55:02 +02:00
kalbl
156c6bab41 Merge branch 'develop' into feature/globebrowsing 2016-10-29 14:12:39 +02:00
Alexander Bock
317ecad9ac Potential fix for High-DPI and manual framebuffer sizes by using SGCT window scaling 2016-10-23 22:55:26 +02:00
kalbl
6ca7cc997c Merge branch 'feature/retina' into feature/globebrowsing 2016-10-20 21:04:18 +02:00
kalbl
2f32e67b87 Set interaction to properly depend on delta time. 2016-10-20 18:37:18 +02:00
Alexander Bock
febf8c9a1b High-DPI fixes for ImGUI 2016-10-19 15:54:19 +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
b448b0ec5e Move all network namespace members into the openspace namespace 2016-09-30 14:13:36 +02:00
Emil Axelsson
0230acb005 Merge branch 'feature/parallelconnection' into develop 
Conflicts:
	src/interaction/interactionhandler.cpp
 2016-09-30 11:01:37 +02:00
Emil Axelsson
15e83394c3 improve look and feel of the html documentation 2016-09-27 14:45:26 +02:00
Alexander Bock
77db054959 Make fontrenderer, gui, and console depend on the window resolution rather than the framebuffer resolution (closing #140) 2016-09-26 19:26:41 +02:00
Alexander Bock
26f4975b17 Clear up MissionManager 
Consolidate core class registrations
 2016-09-26 18:46:20 +02:00
Alexander Bock
7ddccd8172 Rename Ephemeris files to Translation 2016-09-26 13:49:17 +02:00
Alexander Bock
a688a1eee9 Rename Ephemeris to Translation 2016-09-26 13:34:22 +02:00
Alexander Bock
616a115536 Adding a Lua function to manually enable/disable the frame synchronization 2016-09-24 14:55:20 +02:00
Alexander Bock
8cf39cdd29 Only enable syncing after the first frame due to high initialization load 2016-09-24 09:07:15 +02:00
Emil Axelsson
cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection 
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
 2016-09-22 19:33:05 +02:00
Emil Axelsson
112fe7fc54 synchronize time over parallel connection 2016-09-22 18:42:19 +02:00
Alexander Bock
a85356dcff Add a commandline argument to override the cache directory 2016-09-21 22:10:59 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Alexander Bock
d3f7139f5e Merge branch 'feature/globebrowsing' into syncing 
Conflicts:
	modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
 2016-09-20 14:48:28 +02:00
Emil Axelsson
fa8eee5386 sync camera movement over parallel connection 2016-09-19 14:49:57 +02:00
Alexander Bock
8867b3439f Add central location for the core to register documentations 
Add documentation to ScreenSpaceRenderable
Add documentation to Ephemeris
Add documentation to Rotation
 2016-09-19 14:03:42 +02:00
Alexander Bock
85492405bd Make use of referenced verifier for Renderables 
Adapt HTML documentation generation
 2016-09-19 11:24:37 +02:00
Alexander Bock
0a13d5430f Make DocumentationEngine into a singleton object 
Add documentation to DocumentationEngine
Add unique identifier to Documentation class (and enforce in DocumentationEngine)
 2016-09-19 09:31:34 +02:00
Erik Broberg
7f393a3270 Inject SyncBuffer into SyncEngine. Add Doxygen comments for SyncEngine and SyncData 2016-09-16 20:32:29 -04:00
Erik Broberg
dd304fee31 Make ScriptEngine implement Syncable interface 2016-09-16 15:40:29 -04:00