mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-20 01:01:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,931 Commits 84 Branches 47 Tags
3f68ea9b4d724f5199fce99bbb2468540c96ef0e
Commit Graph

7931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ylva Selling
3f68ea9b4d Send over image name and url to GUI api 2021-04-07 16:15:19 +02:00
Ylva Selling
794902d5cb Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-04-06 15:11:25 +02:00
Ylva Selling
b8d1c33eed Add Lua function to send the image thumbnail url:s to the api 2021-04-06 15:11:14 +02:00
Ester Lindgren
d74de3273b Merge with master 2021-04-06 09:01:48 +02:00
Ester Lindgren
ba0685227f Merge branch 'master' into thesis/2021/skybrowser 2021-04-06 08:52:11 +02:00
Ester Lindgren
8ffee81e64 Merge resolve 2021-04-06 08:48:37 +02:00
Ester Lindgren
c234b69436 Add function to drag and change view within browser 2021-04-06 08:44:42 +02:00
Alexander Bock
52b020d836 Include strict lua file, throw error in configuration loading when overriding with unused variable 
- Preventing True/true bug
 - Fix issue with unused variable in configuration_helper
 2021-04-01 23:37:35 +02:00
Gene Payne
7fefbf9ea0 Added CMake variable to avoid minizip error with assimp update on linux 2021-03-31 19:33:50 -06:00
Ylva Selling
f99f3e88a9 Move the WWT data handling to class WWTDataHandler and add pointer in module 2021-03-31 17:03:30 +02:00
Ylva Selling
b95d6e5b94 Change rapidxmlparser to tinyxml2 and add more extensive xml parsing and image loading 2021-03-31 16:41:38 +02:00
Alexander Bock
d9a1a0233b Remove apple clang warnings 2021-03-30 22:12:53 +02:00
Alexander Bock
f7e53386fb Update Ghoul repository to get Mac working again 2021-03-30 19:44:35 +02:00
Ylva Selling
b88d58edbb Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-03-30 08:31:20 +02:00
Ylva Selling
d4e944f73f Add webgui to cmake include dependencies 2021-03-30 08:29:57 +02:00
Ylva Selling
ec138b6897 Add function to save URL to file, parse to XML tree and insert into vector as images 2021-03-30 08:28:32 +02:00
Ylva Selling
0b85180bb5 Add rapid xml parser 2021-03-30 08:24:22 +02:00
Alexander Bock
4ca82fff19 Remove warnings on Apple clang 2021-03-29 23:16:15 +02:00
Alexander Bock
0bfe3f6d72 MacOS compile fix 2021-03-29 21:56:01 +02:00
Alexander Bock
612b9bbc7f Moving more documentation to use codegen (#1549) 
- Make use of more codegen in more classes
- Fix verifier for Color4Verifier
 2021-03-29 21:50:26 +02:00
Alexander Bock
a49c1f435f Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2021-03-29 14:58:24 +02:00
Alexander Bock
797ddf7daf Fix some warnings on AppleClang 2021-03-29 14:58:19 +02:00
Ester Lindgren
19aa6895fd Set fixed width of square target border 2021-03-29 09:57:55 +02:00
Ylva Selling
d72080b2f6 Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-03-29 08:27:53 +02:00
Ylva Selling
bb5042cd50 Create functions to display WWT images 2021-03-29 08:27:40 +02:00
Gene Payne
dd11bfd2f8 Missed a spot with the linux gcc CMake compile options fix 2021-03-28 20:52:33 -06:00
Gene Payne
1f65046127 Updated linux gcc CMake compile options 2021-03-28 20:47:52 -06:00
Alexander Bock
e88650f22c Tiny coding style fixups 2021-03-27 23:49:02 +01:00
Alexander Bock
6aad31000f Don't produce OpenGL performance warning on Intel chips 2021-03-27 22:16:08 +01:00
Alexander Bock
f47d62a5ee Fix verifier for Color4Verifier 2021-03-27 22:16:04 +01:00
Alexander Bock
a6bb8cdecb Split DashboardTextItem from DashboardItem 2021-03-24 17:46:13 +01:00
Emma Broman
38f5a12c24 Avoid crash in RenderEngine if screenshot token has not been registered 
This is the case in for example the test application
 2021-03-24 14:02:05 +01:00
Alexander Bock
4b25f5c074 Move default_dashboard asset from util folder to new dashboard folder that also includes the individual dashboard items 2021-03-24 09:57:27 +01:00
Ester Lindgren
379dc39da0 Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser 2021-03-23 17:12:46 +01:00
Ester Lindgren
7ec1da10f1 Merge resolve 2021-03-23 17:07:00 +01:00
Ester Lindgren
95a012cfae Merge resolve 2021-03-23 16:53:34 +01:00
Ester Lindgren
18e5916a04 Set the crosshair of target to have fixed linewidth 2021-03-23 16:46:52 +01:00
Alexander Bock
0d82e1848f Feature/configuration codegen (#1544) 
Convert configuration document over to codegen
 2021-03-23 15:22:29 +01:00
Ylva Selling
74609230b6 Make browser and target highlight when the mouse is hovering on them 2021-03-23 15:01:40 +01:00
Micah Acinapura
48e2f35aa1 added dialog for choosing scripts from the script log (#1539) 
* added dialog for choosing scripts from the script log
 2021-03-23 08:56:23 -04:00
Emma Broman
0ea0e781da Prevent crash when reloading renderable that only has labels and no data 
Occurred when unchecking and rechecking the "Draw elements" property for example the "Eclipltic Sphere Labels"
 2021-03-23 11:40:34 +01:00
Emma Broman
97c1066149 Fix labels not facing the camera due to static rotation (closes #1542) 
Bring back old transformation matrices
 2021-03-23 11:27:55 +01:00
Ylva Selling
6ff0e6475a Ensure target and browser always are visible together by using the enabled flag 2021-03-23 09:51:15 +01:00
Ylva Selling
fbc05244e1 Make it possible to add many browsers and targets by moving functionality to ScreenSpaceRenderable 2021-03-23 09:44:14 +01:00
Alexander Bock
196a98b0c6 Add ability to StringVerifier to test for non-emptiness 2021-03-23 00:13:52 +01:00
Alexander Bock
45b2d0e014 Update Ghoul with an update to AssImp to fix FBX loading bug 2021-03-23 00:08:35 +01:00
Alexander Bock
2f36c7d88c Use codegen in LogFactory 2021-03-22 23:40:47 +01:00
Alexander Bock
dfc42e9467 Rename createSingeColorImage -> createSingleColorImage 2021-03-22 23:17:42 +01:00
Alexander Bock
c7f77e3286 Add property to determine whether the date should be added to the screenshot folder (#1535) 
closes #1528
 2021-03-22 15:49:30 +01:00
Ylva Selling
ac275140c5 Load browser and target as assets 2021-03-22 13:54:01 +01:00