mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 23:39:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,911 Commits 84 Branches 48 Tags
2b74a04415e54bfb1b2c5d718bc1fe74777fe3bc
Commit Graph

731 Commits

Author SHA1 Message Date
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
Malin Ejdbo c825916d60 Merge branch 'master' into feature/model-animation 
* Resolve conflicts
 2021-03-30 16:31:25 +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
Malin Ejdbo 2feff86181 Clean up 2021-03-29 11:37:23 +02:00
Alexander Bock e88650f22c Tiny coding style fixups 2021-03-27 23:49:02 +01:00
Malin Ejdbo bc9fc63719 Merge branch 'master' into feature/model-animation 
* Resolve conflicts
 2021-03-25 13:54:51 +01:00
Malin Ejdbo 1bfa7bf5f5 Remove support to combine several geometries 
* And make use of file verifier for the model file
 2021-03-24 17:05:18 +01:00
Malin Ejdbo aa5394e88c Add info message when an animation exists for a model 2021-03-23 18:02:06 +01:00
Malin Ejdbo 7ae3922132 Add BounceFromStart and BounceInfinitely animation modes 2021-03-23 13:42:05 +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 dfc42e9467 Rename createSingeColorImage -> createSingleColorImage 2021-03-22 23:17:42 +01:00
Malin Ejdbo 0a9af8f0ed Add error handling 2021-03-22 10:01:16 +01:00
Malin Ejdbo fb4cb67ef6 Add property to enable/disable animation 2021-03-19 09:54:47 +01:00
Malin Ejdbo 3201be5cd6 Add loop from start mode for animation 2021-03-18 09:34:38 +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
Alexander Bock 615fc82b51 Update submodules 
- SGCT:  Fixed an issue that lead to a crash in debug mode
 - Ghoul: Fixed an issue that prevented CEF locales to be copied in a fresh install
 2021-03-15 14:50:39 +01:00
Emma Broman b324ff0705 Update Ghoul 2021-03-12 13:10:51 +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
Malin Ejdbo 4fb8a36952 Merge branch 'master' into feature/multitexturing 
* Resolve conflicts
 2021-03-02 15:49:39 +01:00
Alexander Bock cb5929972a Don't call RenderableOrbitalKeplers's initializeGL only once 2021-02-18 22:42:17 +01:00
Alexander Bock aeb726e5f2 Update Ghoul submodule to make it compile in Linux again 2021-02-15 17:46:48 +01:00
Alexander Bock da31d1e375 Properly handle SpecificationErrors when initializing Modules (closes #1502) 2021-02-15 11:20:27 +01:00
Alexander Bock 23f24c50fe Update Ghoul and remove explicit generation of ConsoleLog 2021-02-13 18:33:28 +01:00
Alexander Bock 2de8ade2b6 Update Ghoul repository 2021-02-13 17:47:18 +01:00
Alexander Bock 88122d1dbb Adapt to new Ghoul; fix previously undetected errors in uniform setting 2021-02-11 14:44:13 +01:00
Malin Ejdbo c3e96c2ec5 Further address OpenSpace PR comments 2021-02-09 17:46:52 +01:00
Emma Broman 4a80b83df8 Update Ghoul repository 2021-02-09 13:37:25 +01:00
Malin Ejdbo 51f02dc738 Small fix and update ghoul 2021-02-08 13:32:38 +01:00
Malin Ejdbo 08e2c3fb41 Address Ghoul PR comments 2021-02-05 11:17:33 +01:00
Alexander Bock 43a333f48e Bring Tracy back to live (currently, the Launcher has to be bypassed because Qt is doing something strange 2021-02-05 10:12:51 +01:00
Emma Broman 57bc3f2222 Update ghoul repository 2021-02-04 13:25:17 +01:00
Malin Ejdbo c6b3b409ff Update assets for new model loading structure 
* Update Ghoul
 2021-02-03 10:19:35 +01:00
Alexander Bock ff39e2630e Update Ghoul repository (closes #1471) 2021-02-01 14:20:55 +01:00
Alexander Bock e50ca7aded Try a fix against random crashes at startup when loading configuration 2021-02-01 13:31:28 +01:00
Malin Ejdbo 73fd118ee2 Merge branch 'master' into feature/multitexturing 
* Resolve conflicts
 2021-02-01 11:57:31 +01:00
Malin Ejdbo f8e59620f9 Adjust RenderableModelProjection to work with new model loader 2021-01-27 16:03:47 +01:00
Gene Payne 0b510edffd Updated ext/json to 3.9.1 to fix gcc10 build (#1456) 2021-01-19 10:37:16 +01:00
Malin Ejdbo 22d0c947c7 Remove numbering of textures in model shader and update ghoul 2021-01-12 16:24:40 +01:00
Alexander Bock d23cfd1d03 Update Ghoul repository 2021-01-12 15:42:48 +01:00
Jonathas Costa 65803e134d Issue/1447 (#1451) 
* Fixed missing calls to OpenGL cache system.
 2021-01-12 10:28:49 +01:00