Alexander Bock
d9a1a0233b
Remove apple clang warnings
2021-03-30 22:12:53 +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
4fb8a36952
Merge branch 'master' into feature/multitexturing
...
* Resolve conflicts
2021-03-02 15:49:39 +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
Malin Ejdbo
4b6a61354d
Add deprecation warning when using several model files for one model
2021-02-17 10:03:54 +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
Alexander Bock
6d821d4f91
Feature/codegen ( #1480 )
...
* Add the ability to automatically generate code to extract values out of a Dictionary (see https://github.com/openspace/codegen for more information on how to use this)
* Applied this technique to a large number of cases in the codebase
* Don't add _codegen files to the repository
Co-authored-by: Emma Broman <emma.broman@liu.se >
2021-02-09 09:12:43 +01:00
Malin Ejdbo
51f02dc738
Small fix and update ghoul
2021-02-08 13:32:38 +01:00
Malin Ejdbo
f65eaaba4d
Address OpenSpace PR comments
2021-02-05 14:14:13 +01:00
Malin Ejdbo
08e2c3fb41
Address Ghoul PR comments
2021-02-05 11:17:33 +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
Alexander Bock
29a76c7d33
Coding style pass on shader code
2021-01-02 21:11:13 +01:00
Alexander Bock
7004c02b86
Happy new year
2021-01-02 15:26:51 +01:00
Alexander Bock
067c0f4b27
Introduction of new Dictionary class ( #1446 )
...
* Adapting to introduction of new Dictionary class in Ghoul
* Mainly replacing usage of float instead of doubles as expected
* Adjust to the lack of the hasKeyAndValue function
2021-01-02 15:07:11 +01:00
Alexander Bock
ad8af3ffeb
Feature/CMake ( #1443 )
...
General CMake cleanup/overhaul
* Enable precompiled headers for all projects
* Move specifications itto separate CMakeLists files
* Add openspace-core as a subdirectory
* Move handle_modules functionality into modules/CMakeLists.txt
* Move handleapplications logic into apps/CMakeLists.txt
* Introduce openspace-module-collection interface library to simplify inclusion of modules in applications
* Turn module initialization into a two-step process to adapt to the new minimal dependency scenario
* Compile time speedup
* Remove circular dependencies between modules and core preventing multithreaded compilation on MSVC
* Build Spice multithreaded and as static library
* Remove dependency from core to module-webbrowser
* Remove unused dependency from kameleon
* Remove additional unnecessary dependencies
* Cleanup volume/kameleon/kameleonvolume modules
* Fix visibility issues. Restrict include paths
* Compile kameleon in parallel
* Other cleanup
* Only copy CEF files from one target (hard-coded to OpenSpace right now)
* Remove unused instrumentation code
* Remove the ability to render AABB for globes as it caused a circular dependency between GlobeBrowsing and Debugging
* Removing compiler and cppcheck warnings
* Turn almost all includes into non-system includes
* Don't warn on deprecrated copy
* Updated submodules
2020-12-28 18:26:57 +01:00
Alexander Bock
86bb19d81c
Feature/warnings ( #1425 )
...
* Remove MSVC, GCC, Clang compiler warnings
* Remove cppcheck warnings
2020-12-07 23:43:05 +01:00
Alexander Bock
60e3ed2170
General pass for coding style
2020-11-28 22:31:06 +01:00
Alexander Bock
efffc25ce0
Feature/globals handling ( #1352 )
...
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982 )
* Initialize glfw first thing to prevent weird joystick loading bug during startup
2020-10-21 22:30:05 +02:00
Alexander Bock
9a030bd7db
Update GLFW to 3.03
...
Remove some warnings
2020-10-10 16:29:12 +02:00
Alexander Bock
00a00c9cc8
Merge branch 'master' into feature/general-performance
...
# Conflicts:
# apps/OpenSpace/main.cpp
# modules/server/src/topics/timetopic.cpp
2020-09-04 13:49:00 +02:00
Alexander Bock
7e06f310eb
Update submodules
...
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
Alexander Bock
e93f1833be
Make more use of temporary string objects in the TimeQuantizer
...
Add GPU markers to the rendering
2020-08-19 18:26:11 +02:00
Alexander Bock
89af15126b
Use global memory block for the models
2020-08-19 10:27:21 +02:00
Alexander Bock
7603edf906
Add the ability to add multiple ModelGeometry's for a RenderableModel to show models with multiple OBJ files without needing to create multiple scene graph nodes
2020-08-18 16:34:54 +02:00
Alexander Bock
d4291163ba
Move ColorTexture from RenderableModel to ModelGeometry
2020-08-18 16:00:32 +02:00
Alexander Bock
97811d82d0
Fix error with time quantizer string conversion
...
Fix error with uninitialized memory in GlobeBrowsing
Remove dynamic memory allocation from on-screen rendering
2020-08-14 14:10:54 +02:00
Alexander Bock
e3699a43a8
Update Ghoul and SGCT
...
Adapt to changes by using more string_view
2020-08-09 20:11:40 +02:00
Alexander Bock
e783807d66
Next step towards enabling a managed memory version of templatefactory
2020-08-04 21:56:39 +02:00
Emma Broman
cb19f730df
Mixed cleanup
2020-07-10 11:25:26 +02:00
Emma Broman
8d45d25ed4
Append TODO comment with color and opacity info
...
This class was not working, so could not test it. As there was already a
todo comment I simply added to the comment.
2020-07-10 11:25:26 +02:00
Emma Broman
2654164a6a
Separate opacity and color and tidy up shaders a bit
2020-07-10 11:25:26 +02:00
Emma Broman
bdb6e626ba
Color values specified with vec3 instead of vec4
2020-07-10 11:25:26 +02:00
Alexander Bock
f1fe2f197b
General code cleanup
2020-04-14 15:48:58 +02:00
Alexander Bock
5e29145395
Coding style cleanup
2020-02-14 19:37:06 +01:00
Alexander Bock
43851899c7
Cleanup of more copyright headers
...
Add debug groups and object names to the OpenGL objects in the framebuffer renderer
2020-02-13 14:59:13 +01:00
Alexander Bock
81fda6c8db
Update Ghoul repository
...
Adapt to changes in Ghoul
2020-02-12 00:01:24 +01:00
Alexander Bock
c8799dcc80
Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0
2020-02-11 00:21:42 +01:00
Alexander Bock
d8e9db76a3
Update the copyright header to 2020
2020-02-10 21:51:01 +01:00
Alexander Bock
da8458ab40
Merge pull request #1052 from OpenSpace/feature/instrument-images-and-sequences
...
added sequenceTypeImageAndInstrumentTimes as option for partially comp…
2020-02-10 18:08:03 +01:00
Alexander Bock
49c793d976
Update Ghoul version
...
Add initial Tracy profiling macros
2020-02-10 14:50:41 +01:00
Alexander Bock
9491f73803
More GLM initialization fixes
2020-02-10 01:18:27 +01:00
Alexander Bock
24ce773da9
Update GLM version
...
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
Micah
ba4972310d
added sequenceTypeImageAndInstrumentTimes as option for patially complete missions
2020-01-26 12:35:27 -05:00
Alexander Bock
e3afd82c47
Move the mapping target->frame from SpiceManager to SpacecraftInstrumentModule (#closes 21)
2019-12-28 00:25:17 +01:00
Alexander Bock
207db3c824
Remove PowerScaledCoordinates and rename PowerScaledSphere to Sphere ( closes #4 )
2019-12-27 23:29:28 +01:00
Alexander Bock
f990aaf01c
Copyright header cleanup
2019-05-16 16:56:56 -06:00
Alexander Bock
4b800ac819
Various small fixes
2019-05-16 12:59:28 -06:00
Alexander Bock
595cbc4bcf
Feature/cleanup ( #837 )
...
* Style guide fixes
* Various cleanups
* Update SGCT
2019-05-03 13:27:43 +02:00