mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,978 Commits 99 Branches 46 Tags
debcb43ade7863d4bbc0e42b377087b07ea22fe3
Commit Graph

787 Commits

Author SHA1 Message Date
Alexander Bock
debcb43ade Feature/assets (#1784) 
General overhaul of the Asset loading system
 2021-12-19 18:04:01 +01:00
Alexander Bock
d32af9117a Code style cleanup 2021-12-10 17:31:01 +01:00
GPayne
49cdabe647 Second attempt at fixing tracy and websocketpp subs in sgct and ghoul 2021-12-06 17:32:35 -07:00
Emma Broman
59dc296cf1 Update ghoul to use new luaTableToString function 
And update some tests based on the change
 2021-12-06 13:21:39 +01:00
GPayne
36f06c494f Updating version of ghoul using updated tracy and websocketpp refs 2021-12-03 12:42:34 -07:00
Alexander Bock
e3e468d5ef Update submodules again 2021-11-04 13:29:09 +01:00
Alexander Bock
f390051e1d Update submodules. Disable /ZI compile-flag when Tracy is enabled to prevent compile errors 2021-11-04 11:35:09 +01:00
GPayne
4211691c7f Update ghoul version for lua variant fix on linux 2021-10-15 14:56:31 -06:00
Alexander Bock
4a860fb01d Some code facelifting 2021-10-14 10:31:46 +02:00
GPayne
a2a8f93ba5 Moved string bracket trim function to ghoul library 2021-10-07 16:10:00 -06:00
Alexander Bock
26c131e7bc Update Ghoul repository to fix case where too many parameters are removed from a Lua state 2021-09-14 21:14:47 +02:00
Alexander Bock
8b59760a59 Update submodules 2021-08-21 11:45:38 +02:00
Alexander Bock
db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
Alexander Bock
af617d1d10 Feature/lua function cleanup (#1719) 
General cleanup of Lua functions and handling of variable extract from a Lua state
 2021-08-19 16:02:14 +02:00
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