Commit Graph

3871 Commits

Author SHA1 Message Date
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
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
Ylva Selling
df5719f39f Change structure of message passing to WWT to more general case with functions 2021-03-03 11:36:23 +01:00
Ester Lindgren
f444fcfa80 Add function to disable faceCamera prpoerty 2021-03-03 10:24:13 +01:00
Malin E
6a59e009ad Merge pull request #1517 from OpenSpace/issue/1516
Issue 1516
2021-03-03 10:06:39 +01:00
Malin Ejdbo
4fb8a36952 Merge branch 'master' into feature/multitexturing
* Resolve conflicts
2021-03-02 15:49:39 +01:00
Ylva Selling
8eadcafce3 Change skybrowser module to work with one localhost and change variable names to ra and dec 2021-03-02 14:27:02 +01:00
Malin Ejdbo
f7a1a24acc Only add eclipse properties if globe has data for eclipse 2021-03-02 11:23:23 +01:00
Emma Broman
97144df4da Add a colored glare to exoplanet stars (#1511)
* Add possibility to multiply color to an image plane

* Add a colored glare to exoplanet stars (issue #1305)
2021-03-02 09:30:03 +01:00
Emma Broman
63fa95504c Expose ImGui external to other modules
And update demo function name to match new version
2021-03-02 08:48:25 +01:00
Emma Broman
29e77534c7 Make use of new verifiers (Color and File) (#1510)
* Use codegen for renderable discs

* Utilize color and file verifier

* Add missing property assignment in exoplanets module
2021-03-02 08:11:49 +01:00
Ylva Selling
87df6932f8 Create functions to look in WWT-window at direction in OpenSpace and some cleanup 2021-03-01 16:50:01 +01:00
Ylva Selling
b24a75e484 Clean up structure so ScreenSpaceBrowser only executes string for javascript 2021-03-01 13:32:53 +01:00
Emma Broman
157ffff25b Update imgui external 2021-03-01 13:24:28 +01:00
GPayne
35b96967af Switched kameleon module ref to commit with linux build fixes 2021-02-26 16:07:14 -07:00
Emma Broman
a901594907 Generate docs for RenderablePlaneImages 2021-02-25 13:47:49 +01:00
Ester Lindgren
a00013af1c Test to setup message communication 2021-02-25 11:03:22 +01:00
Ylva Selling
7c83c4e3da Add working way of instantiating ScreenSpaceBrowser from LuaScript 2021-02-23 14:40:48 +01:00
Ester Lindgren
7d58cf40c2 Add module for skybrowser 2021-02-23 14:07:34 +01:00
Emma Broman
b07320d1da Add missing documentation for NonUniformStaticScale 2021-02-23 10:12:26 +01:00
Jonathas Costa
dd40cf8198 Merge branch 'master' into issue/1099 2021-02-22 11:51:30 -05:00
Emma Broman
b381bd83d3 Add module property for exoplanet habitable zone opacity 2021-02-22 09:38:59 +01:00
Alexander Bock
8ae817f233 Fix coding style issues 2021-02-19 13:48:23 +01:00
Jonathas Costa
ea42de503a Removed test color left by mistake. 2021-02-18 17:37:50 -05:00
Alexander Bock
cb5929972a Don't call RenderableOrbitalKeplers's initializeGL only once 2021-02-18 22:42:17 +01:00
Jonathas Costa
10634a5a0e Merge branch 'master' into issue/1099 2021-02-18 11:53:57 -05:00
Jonathas Costa
c21752f93b Fixed the forward/backward scattering effects. 2021-02-17 21:31:42 -05:00
Jonathas Costa
dfd60dfeec Changed to full texture control as Carter wanted. 2021-02-17 20:53:51 -05:00
Jonathas Costa
0307d94983 Added old rendering method for rings texture as an option. 2021-02-17 16:02:14 -05:00
Gene Payne
f4e7d01aa7 Fixes for Issue #1409 (#1501)
* Fixed renderablesmallbody selective rendering props to accept asset file settings

* Set to only show selective rendering log info msg if render size is 1

* Mirrored selective rendering behavior from smallbody to satellites

* Added property coupling of values to satellite/asteroid render settings for size, start index, upperlimit

* Fix for selective rendering with synced render settings

* Removed redundant property definitions for codegen compliance

* Improvements to documentation and handling values spec'd in asset file

* Fix for satellites: selective rendering settings specified from assets
2021-02-17 12:41:05 -07:00
Alexander Bock
6837bad5b0 Tiny cleanups 2021-02-17 16:18:08 +01:00