Commit Graph

709 Commits

Author SHA1 Message Date
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
Alexander Bock
439808e259 Remove glm_cols and glm_rows function calls in favor of built-in GLM functions 2021-01-02 23:04:33 +01:00
Alexander Bock
1b46f2d429 Update Ghoul repository
- Fixes issue with Dictionary
 - Remove accidentally pushed screenshot folder
2021-01-02 21:10:54 +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
7bf7a25401 Updated submodules (#1444)
* Update submodules
 - Ghoul
   - assimp (5.0.0 -> 5.0.1)
   - catch2 (2.11.1 -> 2.13.3)
   - fmt (7.0.3 -> 7.1.3)
   - freetype2 (2.10.1 -> 2.10.4)
   - glbinding (3.1 -> 3.2)
   - glm (0.9.9.5 -> 0.9.9.8)
   - websocketpp (0.7.x -> 0.8.2)
 - SGCT
   - fmt (7.0.3 -> 7.1.3)
   - freetype (2.9.1 -> 2.10.4)
   - GLM (0.9.9.6 -> 0.9.9.8)
* Update to new include external definition
* Remove warning about no eof newline
2020-12-29 13:44:57 +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
Malin Ejdbo
8aac7d6400 Adjust to the new structure when loading list of models
* Update Ghoul
2020-12-22 14:49:07 +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
f4831b0c03 Feature/jenkins (#1419)
* Add ability to toggle operating system builds on Jenkins via environment variables
* Update ghoul repository
* Update SGCT repository
* Reduce chattiness of the Jenkins log file
* Build native and ninja builds in parallel
* Disable ninja build on Windows as it fails with the OpenSpace Helper
2020-12-02 21:11:46 +01:00
Alexander Bock
60e3ed2170 General pass for coding style 2020-11-28 22:31:06 +01:00
Alexander Bock
33e7561122 Updated Ghoul repository 2020-11-16 15:59:15 +01:00
Alexander Bock
ef081d27aa Try to get the location of the sync folder from the OPENSPACE_SYNC environment variable first, before using the ${BASE}/sync
Update SGCT repository
2020-11-16 10:43:08 +01:00
Malin Ejdbo
fbc8e584d8 Add support for list of model files in asset files
* Load either one or several model files in asset files

* In the case of several model files, combine all models into one single ModelGeometry
2020-11-05 15:52:07 +01:00
Malin Ejdbo
6eef29c423 Update Ghoul and add possiblity to force invivible meshes to render
* Update Ghoul

* Add setting in asset file to specify if invisible meshes should be
  forced to render or not

* Change model shader to work with updated ghoul with embedded materials
  and textures

* In shader, render forced invisible meshes with procedural pink and
  green chessboard pattern
2020-10-26 11:16:56 +01:00
Alexander Bock
1525a0490d Update SGCT and Ghoul repositories for bug fixes 2020-10-21 22:28:58 +02:00
Alexander Bock
9d3e181d38 Fix issue that makes swiftshader folder to appear over and over again 2020-10-20 22:54:05 +02:00
Malin Ejdbo
6df1667583 Add multi model format support with Assimp
* Update submodule Ghoul to point to branch feature/multitexturing

* Remove old datastructure for ModelGeometry (moved to ghoul)

* Change RenderableModel to work with new ModelGeomtry structure in
  ghoul

* Work in progress: Textures
2020-10-20 10:32:12 +02:00
GPayne
37ac1466b4 Fix for crash if screenspace image load fails 2020-10-18 14:13:27 -06:00
Alexander Bock
0779c54a07 Provide correct error message if the ProfileName is empty
Don't include Voyager and Pioneer in the base asset as it takes too long to load
Ensure that the webgui asset can load without the dashboard
Fix scripting issue in Rosetta scene with trails
Fix issue with Dashboards that would actually render one line too far down causing trouble with multiline text
Set the render option for renderablebillboards to view direction by default as the normal mode has some issues (see #1342)
Set more sensible maximum value for RenderablePlanesCloud
Correctly show the number of significant digits in the altitude
Replace setPropertyValue with setPropertyValueSingle when clicking on the friction "buttons" on screen
Add a new script function hasProperty to check whether a property exits
2020-10-17 20:10:15 +02:00
Jonathas Costa
823bd872c2 Update Ghoul. 2020-10-16 09:28:28 -04:00
Alexander Bock
d0aaaeb090 Merge remote-tracking branch 'origin/master' into feature/profile-gui
# Conflicts:
#	data/profiles/apollo8.profile
#	data/profiles/apollo_sites.profile
#	data/profiles/asteroids.profile
#	data/profiles/dawn.profile
#	data/profiles/default.profile
#	data/profiles/default_full.profile
#	data/profiles/gaia.profile
#	data/profiles/insight.profile
#	data/profiles/juno.profile
#	data/profiles/mars.profile
#	data/profiles/messenger.profile
#	data/profiles/newhorizons.profile
#	data/profiles/osirisrex.profile
#	data/profiles/rosetta.profile
#	data/profiles/touch.profile
#	data/profiles/voyager.profile
2020-10-13 16:32:58 +02:00
Alexander Bock
9a030bd7db Update GLFW to 3.03
Remove some warnings
2020-10-10 16:29:12 +02:00