Commit Graph

1787 Commits

Author SHA1 Message Date
Jonathan Bosson b5a058121d put direct-manipulation in its own function, dynamic time step for all but the zoom-DOF 2017-04-25 17:06:46 -06:00
Jonathan Bosson 556e81afeb fix diagonal-orbit-only bug and cleanup of code 2017-04-25 13:11:40 -06:00
Jonathan Bosson 9e869fb384 merge with master 2017-04-24 08:53:38 -06:00
Jonathan Bosson b8e6e06aef include both interaction modes 2017-04-24 08:38:16 -06:00
Jonathan Bosson 3157ac4378 minimization method now finds best-fit values that manipulates the camera state such a way that the error in screen-space is < epsilon 2017-04-21 16:35:56 -06:00
Jonathan Bosson c54039225d Rotation now uses euler angles and modulus to make use of camera rotational axis, 4th DOF is set to be roll 2017-04-21 13:20:02 -06:00
Jonathan Bosson c129bf1112 find minimum vector q that applies to the transform in camera space 2017-04-20 17:02:19 -06:00
Alexander Bock 4511d09b10 - Correctly detect isRegularRendering flag
- Render GUI in the PostDraw function in order render it not on the cubefaces

Closes #259
2017-04-20 18:00:31 -04:00
Jonathan Bosson 0542e7cef5 Levmarq gives right q values, need to transform them to camera space correctly 2017-04-20 15:22:53 -06:00
Alexander Bock 99a128b945 Only update ScreenspaceImage texture when it is dirty 2017-04-20 11:57:02 -04:00
Alexander Bock 28e99edd8e Compile fix with RenderableFieldLines
Update Ghoul repository
2017-04-20 11:56:52 -04:00
Jonathan Bosson 099c343693 levmarq using correct gradient (finite derivative) and using the error to determine next delta step 2017-04-19 18:14:47 -06:00
Jonathan Bosson 0e1b399458 instead of projecting to screen-space the error is now calculated in modelspace (tracing current viewplane pos to surface coordinates) 2017-04-18 16:52:16 -06:00
Jonathan Bosson 58796ca390 func in levmarq now handles the distance between two screen points (one projected from the spheres surface), need to define gradient correctly 2017-04-18 15:57:07 -06: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 481ee7d821 Add extra gdal header that removes external warnings 2017-04-17 18:40:19 -04:00
Alexander Bock 0db98afe6e - Enable caching of TileProviders at startup time
- Enable path tokens in filename for temporal tile providers
 - Add support for relative paths in temporal tile providers
 - Set the GDAL temp dir to the BASE_PATH
 -
2017-04-17 18:38:36 -04:00
Alexander Bock 78c109012a Fix shader compiler error with screenspace renderable 2017-04-17 18:36:29 -04:00
Alexander Bock a0d30b80e5 Add YYYYMMDD_hhmmss time format 2017-04-17 18:36:10 -04:00
Alexander Bock dd32a812e1 Change tabs to spaces 2017-04-17 15:00:15 -04:00
Alexander Bock e350033dbd Fix crash with multiply registered classes 2017-04-15 14:54:49 -04:00
Jonathan Bosson 4c19391f63 found potential reasons for why par returns small values, might want to swap to rotate instead of trans on low DOF cases 2017-04-14 17:00:46 -06:00
Alexander Bock 42d3de6fce Cherry pick commit by Erik Broberg 2017-04-14 18:07:32 -04:00
Alexander Bock 889545bd45 Compile fixes for PresentationSlideProvider 2017-04-14 18:06:46 -04:00
Erik Broberg d90a51297d Cherry pick commit by Erik Broberg 2017-04-14 17:58:24 -04:00
Jonathan Bosson 9c6ecdc6d3 debugging camera transform for manipulation 2017-04-14 15:24:15 -06:00
Jonathan Bosson 581f29ba95 Using levmarq correctly now, need to double check if grad is the partial derivative of s(xi,q). Added name on credits 2017-04-14 14:58:11 -06:00
Jonathan Bosson 3635bbcefc start testing levmarq use 2017-04-14 12:02:11 -06:00
Jonathan Bosson 626c39b62e fix number of iterations 2017-04-13 16:59:34 -06:00
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 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
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
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 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