Emil Axelsson
a108ee1f8a
Fix requests from code review
2017-04-04 14:25:39 +02:00
Emil Axelsson
92df9caf5a
Clean up scene loading
2017-03-07 16:33:56 +01: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
Alexander Bock
4e52f27f9e
Remove Dictionary include with forward declarations
2017-03-01 19:20:00 -05:00
Alexander Bock
2ebc803cb7
Reduce dependency of onscreengui module in libOpenspace
...
Add check to `check_style_guide` that reports wrong dependencies
2017-02-16 16:54:03 -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
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
Emil Axelsson
ad3921fda5
Remove unused postRender method for scene graph nodes and renderables
2016-12-14 14:14:53 +01:00
Alexander Bock
aa496fd28c
Remove the default override of Orbital interaction mode
2016-12-06 08:43:25 +01:00
Alexander Bock
e2305654bc
Correctly deinitialize default FontRenderer
...
Use std::accumulate in property JSON generation
2016-11-14 17:28:59 +01: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
ea1ca95df9
improve look and feel of scenegraph node property documentation
2016-09-29 13:58:18 +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
Alexander Bock
2ed8042667
Add methods to disable synchronization during scene loading as the application will get killed by the sync timeout otherwise
2016-09-21 22:29:52 +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
Emil Axelsson
13610b390d
distinguish between local and remote scripting
2016-09-16 14:53:20 +02:00
Alexander Bock
7f0e0aafcc
Writing property documentation as html
2016-09-16 11:39:26 +02:00
Alexander Bock
408280a533
Rearrange and rename constants in ConfigurationManager
...
Make use of constants in ConfigurationManager documentation
2016-09-15 17:58:31 +02:00
Alexander Bock
43db84f620
Add method to automatically test a dictionary and throw on error
2016-09-15 13:40:39 +02:00
Alexander Bock
989e40395e
Add documentation to scene description files
...
Check incoming scene files against the documentation/specification
2016-09-15 10:39:11 +02:00
Alexander Bock
bb52c33b04
Ability for LuaDocumentationFile, PropertyDocumentationFile, and KeyboardMapping to write HTML output
...
Adding those html files to the gitignore
2016-09-14 13:34:45 +02:00
Alexander Bock
b87e30d0d2
Correctly set argument description for setPropertyValueRegex
2016-09-14 11:12:55 +02:00
Erik Broberg
9196ec2f50
Remove local, shared, synced versions of Time. Keep one source of true
2016-09-03 19:45:58 -04:00
Kalle Bladin
ae1f8e457b
Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation.
2016-08-18 14:21:20 -04:00
Erik Broberg
95da433397
Re-enable scene switching again after incorrect merge from develop
2016-08-02 20:48:53 -04:00
Erik Broberg
244c18fdc7
Solve merge conflicts: develop --> globebrowsing
2016-08-02 18:50:10 -04:00
Matthew Territo
10f9742213
Activate scene change dropdown in Global Properties/SettingsEngine
...
Included some cleanup how the Scene::update function works with the InteractionHandler
2016-07-27 16:49:01 -06:00
Kalle Bladin
541fbba322
Merge with develop and solve conflicts.
2016-07-18 17:26:30 -04:00
Alexander Bock
a244defdbc
Add additional Lua functions that make use of regular expressions to match against fully qualified property identifiers
...
- Making the GUI use the new function setPropertyValueSingle to not incur the overhead of compiling the regex
- The default setPropertyValue Lua function uses a wildcard, which replaces a * with the correct regex (.*) for ease of use
- The setPropertyValueRegex Lua function allows a full regular expression to be used
Closing #108
2016-07-18 20:12:24 +02:00
Alexander Bock
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +02:00
Alexander Bock
dc32dfe075
Added functionality to print all keybindings to file when a scene is loaded
2016-07-14 00:28:09 -04:00
Kalle
dd7abd355a
GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels
2016-07-01 17:42:49 -04:00
kbladin
a89f474502
Solve merge conflict and add properties for friction and interaction parameters.
2016-06-30 14:07:51 -04:00
Kalle Bladin
161d722623
Enable setting of friction, sensitivity and followscalefactor in interaction handler.
2016-06-29 21:13:04 -04:00
Kalle Bladin
35a095c448
Change camera dictionary state representation to consider position, rotation and focus node.
2016-06-29 15:23:37 -04:00
Alexander Bock
9fb7814145
Add visibility toggle to Property base class
...
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00
Alexander Bock
c587b5cdb9
Fix tabs
2016-06-17 18:30:12 +02:00
Alexander Bock
3d4e1ec19c
Merge branch 'develop' into release/ips
...
Conflicts:
tests/main.cpp
2016-06-17 11:31:11 +02:00
Matthew Territo
5925bd9c63
Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp
2016-06-16 17:03:48 +02:00
Kalle Bladin
012bcaefaf
Solve merge conflicts.
2016-06-07 12:54:52 -04:00
Alexander Bock
c6dc426211
Merge remote-tracking branch 'origin/feature/galaxy' into develop
...
Conflicts:
data/scene/default.scene
shaders/PowerScaling/powerScalingMath.hglsl
2016-06-04 19:54:34 +02:00
Emil Axelsson
1901166640
improved galaxy rendering
2016-06-03 11:16:57 +02:00
Erik Broberg
128ee57538
Merge in initialization of camera pos from feature/interaction
2016-05-25 16:47:15 -04:00
Erik Broberg
af9b065de8
Camera gets initialized to position specified in scene file
2016-05-25 16:42:59 -04:00
Kalle Bladin
8ab0a70886
Solve merge conflict for interaction.
2016-05-25 13:20:12 -04:00
Kalle Bladin
1db9f2f60c
Clean up camera class.
2016-05-19 23:21:48 -04:00
Kalle Bladin
4ac19f21b7
Solve merge conflict.
2016-05-19 12:10:14 -04:00
Sebastian Piwell
c2443a9ee2
Merge branch 'develop' into feature/iSWA
2016-05-11 13:30:59 -04:00
Alexander Bock
2c7e1ec9f4
Do not let exceptions in update function escape the loading
2016-05-08 16:21:17 +02:00
