 Ylva Selling
|
e463e35e1b
|
Fix bug with target having flipped y-axis
|
2021-03-19 11:26:39 +01:00 |
|
|
Ylva Selling
|
65c3de6c86
|
Merge resolve fix
|
2021-03-19 11:08:37 +01:00 |
|
|
Ester Lindgren
|
543e3641ab
|
Set target dimensions from browser dimensions
|
2021-03-19 09:57:14 +01:00 |
|
|
Malin Ejdbo
|
f1d66b1a74
|
Add animation mode bounce
|
2021-03-19 09:55:50 +01:00 |
|
|
Malin Ejdbo
|
fb4cb67ef6
|
Add property to enable/disable animation
|
2021-03-19 09:54:47 +01:00 |
|
|
Ylva Selling
|
ac4fc926a2
|
Add function to create browser
|
2021-03-19 09:37:19 +01:00 |
|
|
Ylva Selling
|
3573859ffe
|
Add resizing functionality to all corners and side of browser
|
2021-03-18 16:13:46 +01:00 |
|
|
Malin Ejdbo
|
4eb7c8abce
|
Add animation mode to infinetly loop
|
2021-03-18 16:08:38 +01:00 |
|
|
Malin Ejdbo
|
d534b7dbaf
|
Apply transforms to ModelProjection
|
2021-03-18 15:21:45 +01:00 |
|
|
Malin Ejdbo
|
205374fee2
|
Use codegen in ModelProjection and make use of new dictionary
|
2021-03-18 15:20:23 +01:00 |
|
|
Malin Ejdbo
|
c1fb7d39e7
|
Remove "" from codegen comments
|
2021-03-18 09:40:30 +01:00 |
|
|
Ylva Selling
|
e0559f85b9
|
Merge branch 'master' into thesis/2021/skybrowser
|
2021-03-18 09:35:56 +01:00 |
|
|
Ylva Selling
|
707027664f
|
Merge resolve
|
2021-03-18 09:35:00 +01:00 |
|
|
Malin Ejdbo
|
3201be5cd6
|
Add loop from start mode for animation
|
2021-03-18 09:34:38 +01:00 |
|
|
Ylva Selling
|
c05f8a4e87
|
Add working resize and dragging functionality
|
2021-03-18 09:33:34 +01:00 |
|
|
Malin Ejdbo
|
c253060b25
|
Merge branch 'master' into feature/model-animation
* Resolve conflicts
|
2021-03-18 08:33:43 +01:00 |
|
|
Alexander Bock
|
e2c1414ba6
|
Update to newest codegen, replace std::monostate with ghoul::Dictionary
|
2021-03-17 21:26:57 +01:00 |
|
|
Malin Ejdbo
|
91f9576784
|
Merge branch 'master' into feature/model-animation
* Resolve conflicts
|
2021-03-16 12:22:30 +01:00 |
|
|
Malin Ejdbo
|
323e9b2fb5
|
Update ghoul and add model animation
|
2021-03-16 09:05:32 +01:00 |
|
|
Emma Broman
|
20519d007b
|
Remove hardcoded path to B-V colormap (#1531)
Also prevent future problems in reading the file (e.g. if number of lines of comments would change)
|
2021-03-15 13:22:41 +01:00 |
|
|
Ester Lindgren
|
d43be4a624
|
Merge resolve
|
2021-03-12 15:21:56 +01:00 |
|
|
Ester Lindgren
|
6ac4e594c5
|
Move createtarget function call
|
2021-03-12 14:53:08 +01:00 |
|
|
Ester Lindgren
|
9580c617ef
|
Add target square with shader
|
2021-03-12 14:49:53 +01:00 |
|
|
Malin Ejdbo
|
aebe6c1217
|
Add codegen for renderablemodel
|
2021-03-12 09:55:23 +01:00 |
|
|
Ylva Selling
|
ca93e2990e
|
Change to logarithmic scrolling
|
2021-03-11 17:21:18 +01:00 |
|
|
Ylva Selling
|
a5371776d9
|
Change view direction to what the target points at
|
2021-03-11 17:11:00 +01:00 |
|
|
Ylva Selling
|
3bc5d00aaa
|
Add functionality to drag target when dragging on zoom window
|
2021-03-11 16:20:03 +01:00 |
|
|
Ylva Selling
|
c9fc1765ad
|
Change drag function of target and browser to callback function
|
2021-03-11 16:12:23 +01:00 |
|
|
Ylva Selling
|
ebcbce56f5
|
Add functionality to drag target
|
2021-03-11 14:00:27 +01:00 |
|
|
Ylva Selling
|
c16ee0698f
|
Implement simple version of scroll
|
2021-03-11 11:44:13 +01:00 |
|
|
Ester Lindgren
|
fc3fa859af
|
Merge resolve
|
2021-03-11 10:10:26 +01:00 |
|
|
Ester Lindgren
|
8a0e9e6ed0
|
Add ScreenSpaceSkyTarget class to handle target
|
2021-03-11 10:04:53 +01:00 |
|
|
Ylva Selling
|
c32c1fff6a
|
Add functionality to drag skybrowser
|
2021-03-11 09:23:10 +01:00 |
|
|
Malin Ejdbo
|
775d9751dd
|
Apply mesh transform in shader including normals and tangents
* Update Ghoul
* Loading several models have not yet been updated and will not work with
this commit
|
2021-03-09 11:26:37 +01:00 |
|
|
Ylva Selling
|
f2a3f9b9ff
|
Merge branch 'master' into thesis/2021/skybrowser
|
2021-03-09 08:47:11 +01:00 |
|
|
Ylva Selling
|
0be1f8d48d
|
Add check for joining thread so it is joinable
|
2021-03-08 16:29:33 +01:00 |
|
|
Ylva Selling
|
1bde0560c7
|
Merge resolve
|
2021-03-08 16:07:18 +01:00 |
|
|
Ylva Selling
|
8ac85466e7
|
Make thread be joined, not detached, and run depending on a flag
|
2021-03-08 15:53:45 +01:00 |
|
|
Ester Lindgren
|
fce49cf4ec
|
Change from SkybrowserModule to SkyBrowserModule in lua function
|
2021-03-08 14:03:00 +01:00 |
|
|
Ester Lindgren
|
02c64802cf
|
Merge Resolve
|
2021-03-08 13:53:58 +01:00 |
|
|
Ester Lindgren
|
c11b66173e
|
Create subclass of ScreenSpaceBrowser in SkyBrowserModule and change name of module Skybrowser to SkyBrowser
|
2021-03-08 13:47:50 +01:00 |
|
|
Ylva Selling
|
a77fbcfcfe
|
Merge resolve
|
2021-03-08 08:49:39 +01:00 |
|
|
Ylva Selling
|
72a6b3623d
|
Add message for loading images and functionality to show a target
|
2021-03-08 08:46:57 +01:00 |
|
|
Ester Lindgren
|
af98784dc4
|
Add call to showtarget function
|
2021-03-05 16:00:04 +01:00 |
|
|
Ester Lindgren
|
d85bdd0239
|
Merge resolve
|
2021-03-05 15:45:31 +01:00 |
|
|
Ester Lindgren
|
1eb29ab5ca
|
Add centered target frame
|
2021-03-05 15:33:48 +01:00 |
|
|
Ylva Selling
|
913e975acb
|
Change messages to be created in ghoul dictionaries
|
2021-03-05 11:55:51 +01:00 |
|
|
Ylva Selling
|
7847111afc
|
Add pointer to ScreenSpaceBrowser in SkyBrowserModule and add function to pause time in WWT
|
2021-03-05 10:26:45 +01:00 |
|
|
Ylva Selling
|
7965ed5d24
|
Make WWT follow OpenSpace w thread, change interval for zoom and fix coordinate conversion error
|
2021-03-03 16:45:35 +01:00 |
|
|
Ylva Selling
|
f3de15de59
|
Merge resolve
|
2021-03-03 11:39:16 +01:00 |
|