505a38ecbb
Update ghoul
2021-05-26 16:31:11 +02:00
b17952628c
Adjust RenderablePrism to recent codegen change
2021-05-26 16:04:47 +02:00
4202b21ebc
Merge branch 'master' into feature/jwst
...
* Resolve conflicts
2021-05-26 14:21:10 +02:00
40adb289a3
Adjust lagrange points
2021-05-26 10:44:59 +02:00
cb17bd7570
Remove warnings
2021-05-25 22:06:49 +02:00
6cf6e450fb
Address MacOS compile issues, make ISS model scene graph node visible
2021-05-25 17:50:31 +02:00
3154d37043
filesystem fixes
2021-05-21 13:04:24 -04:00
b9a8ec93de
Update Ghoul version
2021-05-18 14:19:54 +02:00
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
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
139d2c6c6d
Apply more codegen checks ( #1579 )
...
* Apply more codegen checks
2021-05-08 00:44:23 +02:00
1f96920b83
Merge master into jwst branch
2021-05-03 10:03:50 +02:00
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
a92c25216d
Merge branch 'master' into feature/os-model
...
* Resolve conflicts
2021-04-28 11:39:40 +02:00
676e83fe4e
Make the iswa module compile again
2021-04-26 14:29:06 +02:00
c4fad58f3b
Register new OpenSpace model reader
2021-04-22 17:17:16 +02:00
32b6a69900
Update ghoul yet again
2021-04-22 11:27:49 +02:00
64bd51d073
Update Ghoul.. again
2021-04-21 18:36:20 +02:00
667de99f9f
Update Ghoul again
2021-04-21 14:30:38 +02:00
7223ea90bd
Update Ghoul
2021-04-21 13:43:27 +02:00
1267874a06
Update Ghoul and codegen
2021-04-21 10:39:19 +02:00
16bd1d3265
Merge branch 'master' into feature/model-animation
...
* Resolve conflicts
* Master has error with changing focus
2021-04-21 10:23:10 +02:00
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
2b1c0c567d
Update ISS model scale
2021-04-08 17:15:58 +02:00
3ec01fa25e
Address PR comments
2021-04-07 17:25:58 +02:00
e91d833c65
Optimize model rendering
...
* Don't render when too far away, same as RenderableGlobe
2021-03-31 14:19:27 +02:00
d9a1a0233b
Remove apple clang warnings
2021-03-30 22:12:53 +02:00
f7e53386fb
Update Ghoul repository to get Mac working again
2021-03-30 19:44:35 +02:00
c825916d60
Merge branch 'master' into feature/model-animation
...
* Resolve conflicts
2021-03-30 16:31:25 +02:00
4ca82fff19
Remove warnings on Apple clang
2021-03-29 23:16:15 +02:00
0bfe3f6d72
MacOS compile fix
2021-03-29 21:56:01 +02:00
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
2feff86181
Clean up
2021-03-29 11:37:23 +02:00
e88650f22c
Tiny coding style fixups
2021-03-27 23:49:02 +01:00
bc9fc63719
Merge branch 'master' into feature/model-animation
...
* Resolve conflicts
2021-03-25 13:54:51 +01:00
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
aa5394e88c
Add info message when an animation exists for a model
2021-03-23 18:02:06 +01:00
7ae3922132
Add BounceFromStart and BounceInfinitely animation modes
2021-03-23 13:42:05 +01:00
45b2d0e014
Update Ghoul with an update to AssImp to fix FBX loading bug
2021-03-23 00:08:35 +01:00
dfc42e9467
Rename createSingeColorImage -> createSingleColorImage
2021-03-22 23:17:42 +01:00
0a9af8f0ed
Add error handling
2021-03-22 10:01:16 +01:00
fb4cb67ef6
Add property to enable/disable animation
2021-03-19 09:54:47 +01:00
3201be5cd6
Add loop from start mode for animation
2021-03-18 09:34:38 +01:00
91f9576784
Merge branch 'master' into feature/model-animation
...
* Resolve conflicts
2021-03-16 12:22:30 +01:00
323e9b2fb5
Update ghoul and add model animation
2021-03-16 09:05:32 +01:00
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
b324ff0705
Update Ghoul
2021-03-12 13:10:51 +01:00
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
4fb8a36952
Merge branch 'master' into feature/multitexturing
...
* Resolve conflicts
2021-03-02 15:49:39 +01:00
cb5929972a
Don't call RenderableOrbitalKeplers's initializeGL only once
2021-02-18 22:42:17 +01:00
Malin Ejdbo