Jonathan Bosson
9e869fb384
merge with master
2017-04-24 08:53:38 -06:00
Alexander Bock
bf16c76add
Feature/opengldebug ( #290 )
...
* Add InLIstVerifier
* Initial implementation of OpenGL debug messages
* Moving functionality into Ghoul
* Compile fix
* Update Ghoul repository
Make use of the moved OpenGL debug functions
* Update Ghoul to fix GCC and Clang compiler errors
* Add unit test for IntListVerifier
2017-04-18 14:29:23 -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
Jonathan Bosson
c682c0f6b1
merge
2017-04-13 16:27:29 -06:00
Emil Axelsson
5589de995b
Feature/domecasting ( #288 )
...
* Improve dome casting feature. Add basic GUI for domecasting.
* Reenable remote scripting from Lua console. Add more settings and debug information for domecasting.
* Do not try to reconnect to parallel connection forever
* Fix interpolation bug for dome casting with globe browsing interaction mode
* Show parallel connection properties in correct GUI
* Fix bug for dome casting with globe browsing interaction mode. Add property for time tolerance.
* Update header file
* Clean up dome casting code
* Remove obsolete lua functions from ParallelConnection.
2017-04-13 23:16:00 +02:00
Emil Axelsson
a71f4974fe
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/planetradius
...
Conflicts:
modules/space/rendering/simplespheregeometry.h
2017-04-13 21:31:40 +02:00
Gene Payne
0a50043753
Merge pull request #285 from OpenSpace/feature/grouping
...
Feature/grouping
2017-04-13 13:31:07 -06:00
Emil Axelsson
a614f1ffda
Remove some power scaled coordinates. Remove spice dependency from sphere
...
geometry. Remove dead code. Clean up bounding sphere code.
2017-04-13 21:27:49 +02:00
Alexander Bock
76aed0578c
Feature/virtualproperty ( #286 )
...
* Add virtual property owner to OpenSpaceEngine
* Ability to add and remove virtual properties
* Do not try to render empty PropertyOwner name
Compile fix for iswaComponent
Add example in default.scene
* Delete virtual properties also in the OpenSpaceEngine dtor
* Make RenderablePlanet not crash if the nighttextures are not present
* - Add VirtualPropertyManager to manage ownership of virtual properties
- Only execute regex when it was necessary
-
2017-04-13 14:38:28 -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
Alexander Bock
cba54170a4
Updating version number in preparation for Earth Day event
2017-04-12 14:21:13 -04:00
Alexander Bock
bef337c0eb
Minor various fixes
2017-04-12 14:21:02 -04:00
Jonathan Bosson
0320bbd381
Merge branch 'develop' into feature/multitouch
2017-04-11 11:25:59 -06:00
Emil Axelsson
a108ee1f8a
Fix requests from code review
2017-04-04 14:25:39 +02:00
GPayne
bcdd906ad7
Some minor changes and added tag support to screenspacerenderable
2017-03-31 15:14:00 -06:00
GPayne
ae2cb222b0
Switched to using propertyowners in grouping, and group/tag name in group syntax
2017-03-21 11:35:09 -06:00
Emil Axelsson
c361e1aa03
Replace forward declarations with include statements to fix compilation on linux and osx
2017-03-17 09:57:24 +01:00
GPayne
9b7e2c6b38
Initial commit of tags added to properties to enable grouping.
2017-03-16 22:29:43 -06:00
Jonathan Bosson
2e3cd2e599
Touch interaction works decently on globebrowsing and newhorizon scenes. Pause globebrowsing to freeze focus nodes orbit
2017-03-16 13:40:29 -06:00
Emil Axelsson
f3931551bd
Clean up scene loading
2017-03-16 17:06:33 +01: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
ea4d9c8e44
Cleanup of RenderableCrawlingLine
...
Cleanup of RenderableFOV
Add function to SpiceManager that does not return the light travel time
2017-03-12 16:05:14 -04:00
Alexander Bock
dc40812df9
Fix warnings in code
...
Make OpenSpaceTest not flood the console on Jenkins
Fix Vec3 property to signal change correctly
Let RenderablePlanetProject correctly reload base map and height map
Update Ghoul
2017-03-11 11:26:25 -05:00
Alexander Bock
bcf92804b6
Updating Ghoul repository
...
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Emil Axelsson
92df9caf5a
Clean up scene loading
2017-03-07 16:33:56 +01:00
Emil Axelsson
d92d001364
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
2017-03-07 13:19:07 +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
bb4fca593b
Automatically register core classes on first access to DocumentationEngine
2017-03-06 15:06:54 -05:00
Emil Axelsson
0cdceddeee
Rename None to Hidden, to avoid collision with X11 and reset data path
2017-03-06 10:33:30 +01:00
Alexander Bock
dcc9d6228d
Some minor cleanup
2017-03-05 20:08:24 -05:00
Alexander Bock
63af7e67f9
Make the WindowWrapper a PropertyOwner and add SGCT properties to the subclass ( closes #260 )
2017-03-03 18:39:35 -05:00
Emil Axelsson
4307c06d92
Compile fix
2017-03-03 18:19:10 +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
Emil Axelsson
b32c416615
Improvements from code review
2017-03-03 17:39:23 +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
fb67e805ac
Various cleanup
...
Add script that counts the number of includes
2017-03-02 19:50:05 -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
0377737843
Adapt to new interfaces
2017-03-02 18:53:05 +01:00
Emil Axelsson
442969f2b1
Jenkins compilation fix
2017-03-02 18:50:11 +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
Emil Axelsson
cb7e81cf3d
Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner.
...
Conflicts:
modules/volume/CMakeLists.txt
modules/volume/linearlrucache.h
src/engine/openspaceengine.cpp
2017-03-02 18:20:01 +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
3274882ec2
Add checks for inline files in style checker
2017-03-01 21:17:12 -05:00
Alexander Bock
fbea8389c8
- Add check in style guide that prevents ‘using namespace’ in header files
...
- Remove using namespace ghoul::opengl from Globebrowsing and adjust
2017-03-01 21:02:33 -05:00
