mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-25 05:48:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,698 Commits 81 Branches 48 Tags
da956af2bc0af2cd6905eb21890582c78a8af2bc
Commit Graph

1405 Commits

Author SHA1 Message Date
Kalle Bladin 562e249dc9 Merge branch 'develop' into feature/globebrowsing 2016-06-08 12:32:31 -04:00
Emil Axelsson 73ceaafd13 merge 2016-06-08 15:02:10 +02:00
Emil Axelsson 8771a238d3 improve galaxy rendering 2016-06-08 15:00:03 +02:00
Kalle Bladin bc21643f06 Add the ability to change the interaction mode dynamically and via lua script. 2016-06-07 17:25:00 -04:00
Kalle Bladin 012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -04:00
Alexander Bock 146b71e129 Make performance widget graphs fill from right to left instead of circular 2016-06-07 11:16:27 +02:00
Alexander Bock 5a81b1089a Rename PerformanceHelper to PerformanceMeasurement 
Add performance measurements to FramebufferRenderer
 2016-06-06 08:48:44 +02:00
Alexander Bock 55bd1341e6 More work on PerformanceHelper 
Getting first version to run and produce output
 2016-06-06 07:00:36 +02:00
Alexander Bock ff0b916b90 Started implementing PerformanceHelper class 2016-06-06 03:53:42 +02:00
Alexander Bock 1430f6b9c2 Clang compile fix 2016-06-06 03:34:56 +02:00
Alexander Bock 14ee3af94d Make PerformanceManager available 
Add empty PerformanceHelper file
 2016-06-06 03:30:10 +02:00
Kalle Bladin f51f282dbb Merge branch 'feature/interaction' into feature/globebrowsing 2016-06-05 21:28:12 -04:00
Kalle Bladin 45e7c41690 Update camera to use double precition. 2016-06-05 21:27:20 -04:00
Kalle Bladin 187ddb8049 Solve merge conflict 2016-06-05 21:26:04 -04:00
Alexander Bock 53c35c7531 Moving performance-related collection code from RenderEngine into new PerformanceManager code 2016-06-06 03:21:25 +02:00
Kalle Bladin d7278bfcc8 Update camera class. 2016-06-05 21:07:36 -04:00
Alexander Bock 55d484205a Rename performance file 2016-06-06 02:14:42 +02:00
Alexander Bock f8f89e6fd1 Moving more code into performance files 2016-06-06 02:12:46 +02:00
Alexander Bock 2c8e3fd7b9 Refactor PerformanceLayout into new file and reuse between RenderEngine and GuiPerformanceComponent 2016-06-06 01:54:41 +02:00
Erik Broberg 6285cac488 Add more flexibility to construction of Time instances 2016-06-05 18:35:40 -04:00
Alexander Bock 6a4362d6ed Make OpenSpace not crash on a fault rebuild of shaders 2016-06-05 18:52:00 +02: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
Alexander Bock 30264fb00e Add Lua function to check whether a specific module is loaded (closing #36) 2016-06-04 19:38:56 +02:00
Alexander Bock 4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop 
Conflicts:
	data/scene/default.scene
 2016-06-04 19:06:54 +02:00
Alexander Bock afe2ecc1e8 Allow RenderEngine's removeRenderProgram method to reject passed nullptrs 2016-06-04 13:39:11 +02:00
Michael Nilsson f9f9e9abd1 cleanup, update ghoul ref 2016-06-03 11:32:09 -04:00
Emil Axelsson 1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Alexander Bock 4c679c15ea Allow the disabling of ISWA components 2016-06-02 13:25:05 +02:00
Alexander Bock 1e8d329e3d Add a correction factor for ImGui that converts between window coordinates and fbo coordinates (closing #95) 2016-06-02 13:12:28 +02:00
Alexander Bock de3edd5022 Do not clear Framebuffer in FramebufferRenderer so that multiviewport rendering works 2016-06-01 23:15:46 +02:00
Alexander Bock 0508faf7ce Some changes to make GUI optional 2016-06-01 23:15:02 +02:00
Sebastian Piwell 342b7fa985 Renamed IswaGroup to IswaBaseGroup 2016-06-01 15:25:11 -04:00
Alexander Bock a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop 
Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua
 2016-06-01 19:46:23 +02:00
Erik Broberg 9ddb54d546 Add explicit default constructor and copy constructor to class Time 2016-05-31 19:50:11 -04:00
Erik Broberg 6d4c9331dd Enable Time conversion to ISO8601 format 2016-05-31 19:37:17 -04:00
Alexander Bock 00d8445825 Increase the Syncbuffer to deal with larger scripts 2016-05-30 12:26:06 +02:00
Kalle Bladin f1d4e27ce0 Solve problem with globe lagging behind in globebrowsing interaction mode. 2016-05-27 15:34:52 -04:00
Kalle Bladin bbc002514d Possible to render in fisheye mode now that the combinedViewMatrix() function in the camera class actually returns the combined view matrix. 2016-05-27 12:13:40 -04:00
Kalle Bladin 3dff659b3c Cleanup. 2016-05-27 11:38:56 -04:00
Kalle Bladin 060298f74b Solve precision problem that causes jagged movement. 2016-05-27 11:09:07 -04:00
Kalle Bladin e0814a23dd The ellipsoid of a globe is used to determine how to move the camera in a new interaction mode. 2016-05-26 18:56:36 -04:00
Kalle Bladin fc57b1c770 Solve merge conflict. 2016-05-25 21:35:14 -04:00
Kalle Bladin ceb7d0fa63 Remove use of old mousecontroller 2016-05-25 21:32:52 -04:00
Kalle Bladin eed5885f25 Improve interaction. 2016-05-25 21:32:03 -04:00
Kalle Bladin 9bbd52867a Merge branch 'feature/interaction' of github.com:OpenSpace/OpenSpace-Development into feature/interaction 2016-05-25 18:50:40 -04:00
Kalle Bladin 601f86ae78 Solve bug for when tilting the camera. 2016-05-25 18:50:06 -04:00
Kalle Bladin f525eb53cc Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-25 18:03:21 -04:00
Kalle Bladin 3925c30b43 Change size in boundingbox for the globe and the texture and patch size. 2016-05-25 18:03:13 -04: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