 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
|
5156071361
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-06-05 18:43:01 -04:00 |
|
|
Erik Broberg
|
6285cac488
|
Add more flexibility to construction of Time instances
|
2016-06-05 18:35:40 -04: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 |
|
|
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 |
|
|
Kalle Bladin
|
96c4f0e1c9
|
Solve merge conflict
|
2016-06-02 12:57:25 -04:00 |
|
|
Kalle Bladin
|
a5b6eb935a
|
Include list to compile on OSX
|
2016-06-02 12:55:59 -04:00 |
|
|
Alexander Bock
|
4c679c15ea
|
Allow the disabling of ISWA components
|
2016-06-02 13:25:05 +02:00 |
|
|
Alexander Bock
|
0508faf7ce
|
Some changes to make GUI optional
|
2016-06-01 23:15:02 +02: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
|
c84972dee0
|
Updating versioning number to prerelease-9 (IPS)
|
2016-05-31 18:26:20 +02: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
|
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
|
eed5885f25
|
Improve interaction.
|
2016-05-25 21:32:03 -04:00 |
|
|
Kalle Bladin
|
8ab0a70886
|
Solve merge conflict for interaction.
|
2016-05-25 13:20:12 -04:00 |
|
|
Kalle Bladin
|
d5d59302e2
|
Update interaction
|
2016-05-24 22:50:42 -04:00 |
|
|
Kalle Bladin
|
f2c7a826b3
|
Smooth movements using delay.
|
2016-05-24 19:34:57 -04:00 |
|
|
Kalle Bladin
|
54a824e667
|
Some basic orbital interaction via mouse control.
|
2016-05-24 18:30:41 -04:00 |
|
|
Kalle Bladin
|
09ca260778
|
Rotating with orbital interaction mode.
|
2016-05-24 13:26:07 -04:00 |
|
|
Kalle Bladin
|
f438535579
|
Add classes that are not yet used.
|
2016-05-23 13:02:24 -04:00 |
|
|
Kalle Bladin
|
9d235f42b2
|
Remove old parts of the interface to interaction handler.
|
2016-05-20 18:50:11 -04:00 |
|
|
Kalle Bladin
|
c2ef5cca58
|
Remove all implementation from the interaction handler class. Interface is still the same.
|
2016-05-20 17:39:32 -04:00 |
|
|
Sebastian Piwell
|
c983ecfb89
|
Histogram eq with group dataprocessor
|
2016-05-20 16:46:33 -04:00 |
|
|
Kalle Bladin
|
faa52404b2
|
Merge branch 'feature/camera' into feature/interaction
|
2016-05-20 16:09:53 -04:00 |
|
|
Kalle Bladin
|
309c97098c
|
Changed interface of camera class
|
2016-05-20 16:09:35 -04:00 |
|
|
Kalle Bladin
|
dcd00e77d0
|
Minor structural changes in interaction handler.
|
2016-05-20 16:03:30 -04:00 |
|
|
Kalle Bladin
|
3ff322c282
|
Clean up camera class
|
2016-05-20 12:03:05 -04:00 |
|
|
Kalle Bladin
|
74f190ef7e
|
More clean up in camera class.
|
2016-05-20 11:46:36 -04:00 |
|
|
Kalle Bladin
|
e057f60a18
|
Remove psc internally from camera class.
|
2016-05-20 10:31:33 -04:00 |
|
|
Kalle Bladin
|
1db9f2f60c
|
Clean up camera class.
|
2016-05-19 23:21:48 -04:00 |
|
|
Kalle Bladin
|
9dda48d44b
|
Remove functions setViewRotationMatrix and compileViewRotationMatrix from camera class.
|
2016-05-19 12:22:55 -04:00 |
|
|
Kalle Bladin
|
4ac19f21b7
|
Solve merge conflict.
|
2016-05-19 12:10:14 -04:00 |
|
|
Kalle Bladin
|
0215c63bab
|
Camera class compiles but missing implementation of two functions.
|
2016-05-19 11:29:31 -04:00 |
|
|
Emil Axelsson
|
f8007266e8
|
Merge branch 'feature/hybrid-renderer' into feature/galaxy
|
2016-05-19 15:25:10 +02:00 |
|
|
Sebastian Piwell
|
ff39239b0f
|
Auto filter of 'background'
|
2016-05-17 16:11:57 -04:00 |
|
|
Michael Nilsson
|
ae131f88c5
|
changed the naming of min and max value in histogram class
|
2016-05-17 14:02:40 -04:00 |
|
|
Michael Nilsson
|
7549beb5f2
|
solve merge conflict
|
2016-05-17 12:53:29 -04:00 |
|
|
Michael Nilsson
|
d2e913b70e
|
moved histogram class to core
|
2016-05-17 12:49:16 -04:00 |
|
|
Erik Broberg
|
afd8ba5e9b
|
Added copy constructor for Camera
|
2016-05-11 18:36:19 -04:00 |
|