Commit Graph

4170 Commits

Author SHA1 Message Date
Jonathan Bosson 99c5956588 merge with feature/planetradius for boundingSphere 2017-04-13 16:56:55 -06:00
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
Jonathan Bosson f2aebcd880 one step closer, need to figure out gradient of func and how to send cam/node/aspectratio with void* fdata 2017-04-12 16:54:13 -06:00
Jonathan Bosson ab877feaf9 first step for LM algorithm on screen-space points, camera/focusnode causes crashes if not initialized, where do we do this best? 2017-04-12 14:37:28 -06:00
Alexander Bock 53e2aedd81 Compile fix 2017-04-12 16:00:49 -04: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
Alexander Bock 5e7302822b Adding README and CONTRIBUTING, updating CREDITS, LICENSE 2017-04-12 14:20:48 -04:00
Alexander Bock bcedc314f4 Merge branch 'master' of http://github.com/OpenSpace/OpenSpace 2017-04-12 13:32:21 -04:00
Alexander Bock 087ec76ebb Fix problem with openspace.setPropertyValue not working 2017-04-12 13:32:15 -04:00
Emil Axelsson b92fa3ca5e Fix bug causing inconsistent imgui state when pressing the enter key 2017-04-12 15:46:28 +02:00
Jonathan Bosson 53f679ae92 crash fix, _camera and _focusNode now have to be declared outside the constructor 2017-04-11 15:15:13 -06:00
Jonathan Bosson 0320bbd381 Merge branch 'develop' into feature/multitouch 2017-04-11 11:25:59 -06:00
Jonathan Bosson 60849e266b small cleanup 2017-04-10 21:03:55 -06:00
Alexander Bock 51b420f2c4 Remove warnings
- Unit tests
  - core
  - onscreengui
  - debugging
  - newhorizons
Update Ghoul
2017-04-10 14:33:45 -04: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 f993f45dd1 Cleaner specification of "Scene" attribute in Lua-generated SGCT Configuration 2017-04-10 13:02:21 -04:00
Alexander Bock 644ba0a3e2 Added a temporal version of the VIIRS_SNPP_DayNightBand_ENCC (closing (#193) 2017-04-08 00:19:48 -04:00
Alexander Bock 2345b82a78 Support path tokens in TemporalTileProviders (closing #283) 2017-04-07 22:40:30 -04:00
Alexander Bock 175b253a3c Fix warning in RenderableKameleonVolume 2017-04-07 22:40:11 -04:00
Jonathan Bosson d749d864a1 attempted to make zooming velocities smoother 2017-04-07 16:30:40 -06:00
Jonathan Bosson 2f6fede0ed build fix 2017-04-07 11:30:54 -06:00
Jonathan Bosson 1c1570e854 defined a function to go from modelview to screen space view, comments on step-by-step method for the direct-touch solution 2017-04-07 11:12:02 -06: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
Alexander Bock 78b0d77101 Start removing warnings 2017-04-06 20:07:01 -04:00
Alexander Bock f07f246c39 Update submodules 2017-04-06 19:38:56 -04:00
Alexander Bock d7e1a21551 Define compile options as private for supressing warnings 2017-04-06 19:38:10 -04:00
Jonathan Bosson 31e175232a the point on the surface of a body can now be described in spherical coordinates 2017-04-06 15:16:25 -06:00
Jonathan Bosson cbc8a2cb7e touch is more snappy, nice 2017-04-06 14:06:40 -06:00
Emil Axelsson 6a851e11a3 Correct the order of initialization and scene loading 2017-04-05 17:40:00 +02:00
Jonathan Bosson 4416707931 find traced rays intersection point on boundingsphere for direct touch interaction 2017-04-04 13:36:35 -06:00
Alexander Bock 567b5a528f Add a version to the LuaConsole log cache file 2017-04-04 13:34:32 -04:00
Alexander Bock c3dd7a7c7b Merge branch 'develop' of http://github.com/OpenSpace/OpenSpace into develop 2017-04-04 13:22:09 -04:00
Emil Axelsson 72242db84c Merge pull request #273 from OpenSpace/pr/scenegraph-refactor
Pr/scenegraph refactor
2017-04-04 16:31:17 +02:00
Emil Axelsson d5722343f3 Replace auto by explicit type 2017-04-04 15:25:53 +02:00
Alexander Bock 5364e2c835 Fix non-temporal VIIRS file
Enable caching on default for all Earth-based datasets
2017-04-04 08:54:41 -04:00
Emil Axelsson a44978b90e Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-04-04 14:26:17 +02:00
Emil Axelsson a108ee1f8a Fix requests from code review 2017-04-04 14:25:39 +02:00
Alexander Bock a35609c6dd Add new libCurl that supports SSL for new GIBS datasets
Update WMS specification of GIBS datasets
2017-04-03 15:53:56 -04:00
Emil Axelsson ccb11784f5 Merge pull request #277 from Anteige/patch-1
Using the implemented method for the condition.
2017-04-03 17:29:04 +02:00
Jonathan Bosson c6b8917d4b rotation correction when selecting new node 2017-03-31 16:27:06 -06:00
Jonathan Bosson 7b23c17b10 TuioEar can now detect a tap, implemented picking feature. If a selectable node is tapped at that is set as the new focusNode and the camera does a panning to that direction. If not will the camera zoom in towards the focusNode 2017-03-31 14:39:05 -06:00
Jonathan Bosson a5873c3002 tracing now works correctly with panning, there's an issue when OpenSpace aspect Ratio is not the same as the touch interface aspect ratio 2017-03-30 16:28:51 -06:00