c2443a9ee2
Merge branch 'develop' into feature/iSWA
2016-05-11 13:30:59 -04:00
2c7e1ec9f4
Do not let exceptions in update function escape the loading
2016-05-08 16:21:17 +02:00
0d49076c54
solve merge conflict with develop
2016-05-03 17:11:28 -04:00
f05672436e
removed iswamanager update function and create cygnet through scripts instead
2016-05-03 15:07:22 -04:00
cfb895e2e9
Move fboPass shader into NewHorizons module
2016-05-01 13:14:36 +02:00
20532d704f
Rename Lua functions to preInitialization and postInitialization
...
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02:00
75175512a8
First implementation of moving the startup scripts into the scene description files
2016-04-27 16:46:31 +02:00
b46f40030b
Untabify more files
2016-04-27 14:24:58 +02:00
c72536fbbc
untabify to make merge easier
2016-04-20 15:21:30 -04:00
07dfafeddb
solve merge conflict with develop
2016-04-20 15:03:51 -04:00
906470f28e
Untabify the rest of the source files
...
Update Ghoul repository
2016-04-18 20:14:29 +02:00
a21c9538b6
Untabify more files
2016-04-18 15:15:30 +02:00
f0748505b7
Include VisualStudioOutputLog
...
Correctly allow '/' character in SceneGraph description files
2016-04-18 15:12:40 +02:00
04af38f546
Enable subdirectories by specifying an intermediate directory in the scene file
2016-04-15 10:27:41 -04:00
588bc74a88
Enable subdirectories for modules
...
Move newhorizons scene modules into subdirectories
2016-04-15 09:52:08 -04:00
ef2981f535
Enable global variables for module Lua scripts (closing #172 )
...
Adapt New Horizons kernels to global switch between accurate and publicly avaiable kernels
2016-04-14 22:33:28 -04:00
6b5681626b
Removing clang-analyze warnings
2016-04-13 11:46:07 -04:00
a820d0a4dd
Parse json to lua table string
2016-04-11 12:11:38 -04:00
6f582912f6
Update with ISWAManager
2016-04-08 16:10:53 -04:00
a55d5e9e9a
Put ISWACygnets in sceneGraph
2016-04-08 15:42:24 -04:00
8c354e5e37
Add Lua functions to add and remove SceneGraphNodes
2016-04-08 13:35:04 +02:00
21276f2cd8
Adding methods to add and remove scenegraphnodes from the scenegraph at runtime
2016-04-08 13:11:54 +02:00
019092e98e
Correctly set child nodes for SceneGraphNode%s
2016-04-04 20:26:10 +02:00
a44eed992f
Merge remote-tracking branch 'origin/feature/volumerendering' into develop
2016-03-21 18:55:32 +01:00
ebe10a29b5
Volume rendering compatible with abuffer and framebuffer renderers
2016-03-21 16:40:24 +01:00
c3aa8fecc2
Update ghoul to account for removed boost dependency
2016-03-15 23:59:57 +01:00
df0d0d1258
Update Ghoul version to accommodate public API bool parameter changes
2016-03-06 08:08:06 +01:00
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
cee66b9c5e
Fix image projection error that occurred due to degrees v radians glm functions
...
Don't crash if a shader recompile fails, but log an error
Use correct file extension for binary Spice kernels
2016-01-31 13:56:46 +01:00
c87fdfd38b
Fixes for Windows
...
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
2016-01-02 21:40:15 +01:00
0735d0fc2d
More cleanup of FactoryManager
2015-12-14 17:55:24 -08:00
177571195c
Completely remove references to constants.h
2015-12-14 17:36:15 -08:00
e26f1d41a4
Updated Ghoul version
...
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
cd3a819541
Updating Ghoul version
...
Applying new Ghoul changes
2015-12-09 14:41:50 -05:00
ba35b834f7
Update Ghoul
...
Adapted to new ghoul version
2015-12-02 22:47:15 -05:00
bacb1a46f9
Fixing one more memory leak that leaked a StaticEphemeris per ScenegraphNode
2015-07-06 23:42:04 +02:00
19540a6f21
Fixing a memory bug in SpiceManager
2015-07-06 22:47:55 +02:00
34412b7a8b
more work on communication protocol
2015-07-06 10:00:07 +02:00
47b40e23d0
Merge branch 'develop' into feature/remote_redesign
...
* develop:
Renamed getLua, setLua, getString, and setString methods to add "Value" to the end of the method name Added documentation for getString/setString methods
Enable Properties to be set by strings
Add a button to the SyncWidget to allow it to be closed
Updated to new Ghoul version
Make multithreaded download a toggle
Correctly Set the CMAKE_PREFIX_PATH for Qt on Mac
Add commandline argument to OpenSpaceEngine to override scene file Make scene file selectable in Launcher, using the configurationfile value as default
Non-Windows compile fix
Include stylesheet in main file
Add stylesheets and general improvements
2015-07-05 16:43:38 +02:00
03994b2758
Renamed getLua, setLua, getString, and setString methods to add "Value" to the end of the method name
...
Added documentation for getString/setString methods
2015-07-05 16:37:03 +02:00
2188fc1809
Merge branch 'develop' into feature/remote
...
* develop: (72 commits)
Disable blackout on startup
Fixed path bug
Remove the rendering method override
Fix crash that happens when SpiceManager is deinitialized
Adding convenient scripts for showing 67P and changing coordinate system to 67P
Adding hybrid read method for Pluto Cleanups + logical changes to parsing and sequencing
Adding the possibility to project to arbitrary bodies model files
Adding support for imageplanes for multiple instruments
Fixing bug in model magnification
Made destination optional in data specifications
Renamed OpenSpaceModule's initialize method to create Created new initialize method that gets called in OpenSpaceEngine initialize
Remove setName function from OpenSpaceModule and move naming into constructor
Always build libtorrent as a static library
Set Launcher as default application Don't copy curl.dll on non-windows system
Correct CURL cmake specification
Add the FindCurl module from CMake into the support directory
Fix method renaming error in volume module
Updated data folder reference
Make SpiceManager derive from Singleton
Allow left-aligned and right-aligned messages in Launcher
...
Conflicts:
modules/kameleon/CMakeLists.txt
openspace.cfg
src/engine/openspaceengine.cpp
2015-07-01 14:38:33 +02:00
2529d4c4d6
added definitions of which scripts should be shared over parallel connection
2015-06-26 09:37:51 +02:00
7401b7d48b
Enable FrameBuffer-based rendering on Windows
2015-06-18 15:42:41 +02:00
77cc5dba49
Moving onscreen gui into its own module
2015-05-26 22:52:12 +02:00
4dddafcec9
Fixing more memory leaks
2015-05-26 21:44:49 +02:00
659326b9a9
Remove 1500+ memory leaks in OpenSpace and Ghoul
2015-05-25 19:37:56 +02:00
ef58668b81
Making OpenSpace compile and run when the NewHorizons module is not loaded
2015-05-23 20:47:06 +02:00
e51df4b2a0
Sorting more classes into the correct modules
2015-05-20 21:40:52 +02:00
Sebastian Piwell