Commit Graph

1873 Commits

Author SHA1 Message Date
Jonathan Bosson
c682c0f6b1 merge 2017-04-13 16:27:29 -06:00
Jonathan Bosson
47535e38f9 func and grad should now be defined correctly, needs to be tested 2017-04-13 16:20:20 -06: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
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
Kalle Bladin
8a617ee254 Feature/globebrowsing (#281)
* Solve bug related to corrupted texture tiles for certain sizes.

* Regard layer settings when sampling height map.

* Make Tile in to a class instead of a struct.

* Memory aware lru cache. Needs cleanup.

* Clean up and comment.

* Clean up and comment.

* Clean up

* Clean up and comment.

* Fix compilation error on Windows.

* Specify data type explicitly in GDAL xml config files for Utah height maps. Closes #242

* Update the key type for the memory aware lru cache and use a unordered map instead of a map.

* Solve pixel row size bug.

* Solve initialization bug.

* Add cache size as property of the globe browsing module.

* Use memory aware tile cache for text tile provider.

* Log GDAL errors as GHOUL messages

* Add the ability to toggle tile level limiting by available data

* Add ability to toggle GDAL logging

* Add lock guard to memory aware tile cache

* create base class rawtiledatareader that can be extended with different implementations than GDAL.

* Let GdalWrapper take care of global GDAL settings.

* Move iodescription to separate file

* Move some functionality from gdalrawtiledatareader to rawtiledatareader

* Move functionality from gdalrawtiledatareader to rawtiledatareader.

* GDAL is no longer a necessary dependency for the globebrowsing module. However to read tiles, the SimpleRawTileDataReader needs to be implemented. Otherwise GDAL is needed.

* Add ifdef check for GLOBEBROWSING_USE_GDAL

* Implement SimpleRawTileDataReader. Currently can only read pow 2 textures.

* Change ints to unsigned long longs

* Limit number of texture creations per tile provider per frame

* Solve linker error on windows

* Fix Windows build errors

* Fix crash in reading local patches

* Update lodglobe descriptions

* Abstract away overviews in gdal raw tile data reader

* Update Mars and Moon configs.

* Update screenshot script

* Update ghoul version

* Remove use of interaction depth below ellipsoid

* Normalize direction vector

* Use scale for distance swotch

* Go back to use of interaction depth below ellipsoid

* Fix comments on pull request.

* TileProviderByLevel error does not propagate up.

* Comment on mars and moon mod file

* Add model space cut off level as a property

* Update ChunkTile struct

* Minor clean up

* Go back tu constructor for ChunkTile
2017-04-13 10:14:47 +02:00
Alexander Bock
bef337c0eb Minor various fixes 2017-04-12 14:21:02 -04:00
Alexander Bock
087ec76ebb Fix problem with openspace.setPropertyValue not working 2017-04-12 13:32:15 -04:00
Jonathan Bosson
0320bbd381 Merge branch 'develop' into feature/multitouch 2017-04-11 11:25:59 -06:00
Alexander Bock
fabe6dafd9 Remove warnings
- Unit tests
  - core
2017-04-10 14:17:25 -04:00
Alexander Bock
38becc4e88 Merge branch 'develop' 2017-04-10 13:03:32 -04:00
Alexander Bock
7f2aa891d1 Do not crash if a non-existing kernel file is loaded through the Lua interface (closing #279) 2017-04-06 23:27:41 -04:00
Alexander Bock
9f3bbe324d Remove warnings 2017-04-06 23:19:23 -04:00
Emil Axelsson
6a851e11a3 Correct the order of initialization and scene loading 2017-04-05 17:40:00 +02:00
Alexander Bock
567b5a528f Add a version to the LuaConsole log cache file 2017-04-04 13:34:32 -04:00
Emil Axelsson
d5722343f3 Replace auto by explicit type 2017-04-04 15:25:53 +02:00
Emil Axelsson
a108ee1f8a Fix requests from code review 2017-04-04 14:25:39 +02:00
Antoine Gaulin
0173785c13 Using the implemented method for the condition.
You can use the method for the condition since you have implemented it.
2017-03-30 10:21:39 -04:00
Jonathan Bosson
6e56862412 Fix on camera issues with it not following rotation/position of focus node. configSensitivites() only done during globebrowsing now 2017-03-16 15:28:46 -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
361f9face5 - Disable barrier when loading a scene.
- Remove syncables before deinitializing openspaceengine
2017-03-16 14:35:22 +01:00
Jonathan Bosson
b66d1f32c4 merge with develop 2017-03-14 16:39:15 -06:00
Jonathan Bosson
1fa5220e3c minor changes during meeting 2017-03-14 12:44:43 -06:00
Alexander Bock
5e2bf6e820 Let the ReferencingVerifier fail gracefully if a referencing identifier is not found 2017-03-14 13:47:55 -04:00
Emil Axelsson
ca6348194e Clean up scene loading 2017-03-14 13:40:18 +01:00
Alexander Bock
d61bb20992 Some more work on RenderableFov
Make registerting path tokens through Lua scripts work
2017-03-13 09:52:06 -04: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
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
Alexander Bock
5d57c3a577 Remove extra whitespace at the end of stored Lua commands in the history 2017-03-07 10:38:15 -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
78ae311a1f Fix length of RenderableFov when target is not in field-of-view 2017-03-06 15:56:13 -05:00
Alexander Bock
bb4fca593b Automatically register core classes on first access to DocumentationEngine 2017-03-06 15:06:54 -05:00
Alexander Bock
c93af1fcfc Make the LuaConsole not crash if the cached history file does not exist 2017-03-06 14:20:03 -05:00
Emil Axelsson
5c1f3fd0bc Merge pull request #268 from OpenSpace/pr/enum-compile-fix
Rename None to Hidden, to avoid collision with X11 and reset data path
2017-03-06 15:33:59 +01:00
Alexander Bock
03db7a8cc3 Register the LogFactoryDocumentation prior to the Configuration 2017-03-06 09:32:27 -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
ad2b627c0e Fix LogFactory to actually use the presented values 2017-03-05 17:28:06 -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
Jonathan Bosson
4a2d70b88d merge with develop for jenkins build messages 2017-03-03 12:10:41 -07: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