Emma Broman
8d7d8b9ba4
Feature/state machine ( #1705 )
...
* Fix script error in old state machine example
* Add a module with a more complex state machine, that can be created and controlled through the Lua API. Useful for interactive installations
* Add an example asset for the new state machine and rename the old linear "state machine" to luastatemachine
Co-authored-by: Malin Ejdbo <malin.ejdbo@gmail.com >
2021-08-16 09:29:45 +02:00
Malin Ejdbo
ae1c929001
Update Ghoul
2021-08-11 13:00:15 +02:00
Malin Ejdbo
30f7396ec1
Update Ghoul with new .osmodel file format
2021-08-11 10:15:44 +02:00
Alexander Bock
5b3a66156c
Remove unnecessary template specification for lock_guard
2021-07-30 14:48:08 +02:00
Alexander Bock
5f139b8144
Tune the look of the asset dialog
2021-07-27 14:14:19 +02:00
Alexander Bock
a13f94da21
Add ability to print all types of information in the printInfo/... functions ( closes #1635 )
2021-07-27 11:26:41 +02:00
Alexander Bock
043fb9c4e9
Prevent the failure of font loading from keeping file handles open and breaking everything else ( #1627 )
2021-07-26 15:21:06 +02:00
Alexander Bock
eb1de6fbd2
Update Ghoul repository
2021-07-26 13:35:31 +02:00
Micah Acinapura
95d008f69e
update ghoul
2021-07-07 11:16:15 -04:00
Malin Ejdbo
36393c1078
Update Ghoul
2021-07-02 10:01:57 +02:00
Malin Ejdbo
9d7d8686ea
Merge master
2021-07-02 10:00:42 +02:00
Malin Ejdbo
bec5274ff0
Merge in master
2021-07-02 09:53:53 +02:00
Malin Ejdbo
505601b1c9
Update Ghoul
2021-07-02 09:35:16 +02:00
Malin Ejdbo
7aafe39583
Add base texture or color to ModelProjection
2021-06-28 15:28:08 +02:00
Alexander Bock
a69b636dea
Global sweep to cleanup the handling of floating point numbers and glm default initialization
2021-06-16 23:09:49 +02:00
Micah Acinapura
611f7b6ef4
update ghoul
2021-06-14 17:51:20 -04:00
Micah Acinapura
4d02b02081
SpiceManager - initialize default matrix; Update ghoul
2021-06-10 12:30:53 -04:00
Malin Ejdbo
bf016f3b47
Update Ghoul
2021-05-31 19:09:03 +02:00
Malin Ejdbo
9f7b8aa32b
Merge branch 'master' into feature/jwst
...
* Resolve conflict
2021-05-31 15:45:10 +02:00
Malin Ejdbo
31b834dbb2
Address PR comments
2021-05-31 15:34:54 +02:00
Alexander Bock
744ba0dc9b
Feature/side by side ( #1613 )
...
* Make atmosphere, raycasting, and trails work with side_by_side stereo
2021-05-28 23:31:10 +02:00
Malin Ejdbo
0a1c842345
Some clean up
2021-05-28 13:26:47 +02:00
Malin Ejdbo
505a38ecbb
Update ghoul
2021-05-26 16:31:11 +02:00
Malin Ejdbo
b17952628c
Adjust RenderablePrism to recent codegen change
2021-05-26 16:04:47 +02:00
Malin Ejdbo
4202b21ebc
Merge branch 'master' into feature/jwst
...
* Resolve conflicts
2021-05-26 14:21:10 +02:00
Malin Ejdbo
40adb289a3
Adjust lagrange points
2021-05-26 10:44:59 +02:00
Alexander Bock
cb17bd7570
Remove warnings
2021-05-25 22:06:49 +02:00
Alexander Bock
6cf6e450fb
Address MacOS compile issues, make ISS model scene graph node visible
2021-05-25 17:50:31 +02:00
Micah Acinapura
3154d37043
filesystem fixes
2021-05-21 13:04:24 -04:00
Alexander Bock
b9a8ec93de
Update Ghoul version
2021-05-18 14:19:54 +02:00
Alexander Bock
92432caed2
Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string
2021-05-17 00:23:15 +02:00
Alexander Bock
ccdc5a5dc3
Feature/filesystem cleanup ( #1587 )
...
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
2021-05-16 20:26:49 +02:00
Alexander Bock
139d2c6c6d
Apply more codegen checks ( #1579 )
...
* Apply more codegen checks
2021-05-08 00:44:23 +02:00
Malin Ejdbo
1f96920b83
Merge master into jwst branch
2021-05-03 10:03:50 +02:00
Alexander Bock
863a861944
Feature/galaxy ( #1576 )
...
* Some cleanup of the galaxy renderer
* Remove translation from renderablegalaxy
* Apply additive blending when compositing downsampled volume; Use star distance as alpha for transparency (closes #1208 )
2021-04-30 14:31:12 +02:00
Malin Ejdbo
a92c25216d
Merge branch 'master' into feature/os-model
...
* Resolve conflicts
2021-04-28 11:39:40 +02:00
Alexander Bock
676e83fe4e
Make the iswa module compile again
2021-04-26 14:29:06 +02:00
Malin Ejdbo
c4fad58f3b
Register new OpenSpace model reader
2021-04-22 17:17:16 +02:00
Malin Ejdbo
32b6a69900
Update ghoul yet again
2021-04-22 11:27:49 +02:00
Malin Ejdbo
64bd51d073
Update Ghoul.. again
2021-04-21 18:36:20 +02:00
Malin Ejdbo
667de99f9f
Update Ghoul again
2021-04-21 14:30:38 +02:00
Malin Ejdbo
7223ea90bd
Update Ghoul
2021-04-21 13:43:27 +02:00
Malin Ejdbo
1267874a06
Update Ghoul and codegen
2021-04-21 10:39:19 +02:00
Malin Ejdbo
16bd1d3265
Merge branch 'master' into feature/model-animation
...
* Resolve conflicts
* Master has error with changing focus
2021-04-21 10:23:10 +02:00
Alexander Bock
d32a09ba80
Feature/strict lua ( #1556 )
...
Make all LuaState strict to check whether uninitialized variables are used
Adapt the existing assets to work with the strict state
2021-04-15 13:01:00 +02:00
Malin Ejdbo
2b1c0c567d
Update ISS model scale
2021-04-08 17:15:58 +02:00
Malin Ejdbo
3ec01fa25e
Address PR comments
2021-04-07 17:25:58 +02:00
Malin Ejdbo
e91d833c65
Optimize model rendering
...
* Don't render when too far away, same as RenderableGlobe
2021-03-31 14:19:27 +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
