8730b721f4
Remove unused vTune code
...
Remove unused VLD code
2020-08-20 15:17:12 +02:00
0f71f7b654
Update submodules
2020-08-17 21:35:22 +02:00
e04fd0e132
Update SGCT repository
2020-08-10 15:58:59 +02:00
e3699a43a8
Update Ghoul and SGCT
...
Adapt to changes by using more string_view
2020-08-09 20:11:40 +02:00
17702c2129
Fixed include for Visual Studio Version 16.7.0
2020-08-06 13:36:08 +02:00
1cfd716026
Revert "Fixed include for Visual studio Version 16.7.0"
...
This reverts commit 91862759d3
2020-08-06 13:35:33 +02:00
91862759d3
Fixed include for Visual studio Version 16.7.0
2020-08-06 13:28:16 +02:00
11f537e2e2
Fix issue with constellation art that left merge conflict annotations behind
2020-07-09 13:01:32 +02:00
96b775d939
Merge branch 'master' into feature/profiles
...
# Conflicts:
# data/assets/asteroids.scene
2020-07-07 12:59:52 +02:00
bad2acb260
Update submodules
2020-07-06 15:55:00 +02:00
6db7d503a3
Linux fixes clang ( #1216 )
...
* Changes to work on Linux.
* Multiple small fixes for Linux.
* Changes to have trails working on Linux again.
* Bring back AA Trail Lines on Linux.
* Included new branch with correction in cfitsio library linking.
* Updated SGCT.
* Changes to work on Linux.
* Remove extra #endif
* Changes to compile in Clang on Linux.
* Other fixes.
* Bring back some of the changes lost and updated clang building commands.
* requiring 10.15 for sgct, upadating sgct
Co-authored-by: Jonathas <jon.costa@gmail.com >
Co-authored-by: Tom Schober <tom@tomschober.com >
Co-authored-by: Alexander Bock <mail@alexanderbock.eu >
2020-06-25 18:55:20 -04:00
f138708fd9
Update SGCT to not require the specification of projection planes if 3D rendering in not required
...
Remove comments as it is the preferred way of handling the web gui
2020-06-23 15:18:25 +02:00
386e7d9312
fixed reading config files, single_gui.xml, and updating webmodules for sgct init changes
2020-06-22 10:23:04 -04:00
e5719952b1
Add the ability to load images lazily for RenderablePlanes
...
Add ability to purge textures from RAM if they are read-only
Make use of both for constellation images to reduce the memory footprint
(cherry picked from commit 7f0c92430f
2020-06-15 16:08:28 +02:00
7f0c92430f
Add the ability to load images lazily for RenderablePlanes
...
Add ability to purge textures from RAM if they are read-only
Make use of both for constellation images to reduce the memory footprint
2020-06-15 16:07:16 +02:00
1e9df1cb4b
Merge branch 'master' into feature/profiles
...
# Conflicts:
# include/openspace/scene/assetloader.h
# src/scene/assetloader.cpp
2020-06-14 17:54:25 +02:00
7fb81a9ca2
Improve the performance of Borisov's trajectory by reducing the sampling rate from one sample per minute to one sample per week (it doesn't really change directions that fast anyway)
2020-06-12 19:43:21 +02:00
433d96bbb4
SGCT compile fix
...
First pass for pull request
2020-06-11 00:24:58 +02:00
9c2b5eefb2
Updated SGCT submodule to latest changes
2020-05-25 11:02:55 +02:00
3b427bfd15
Cleaning up window delegate
2020-05-10 15:17:51 +02:00
9ea5c0d66f
Update SGCT repository
2020-04-24 11:07:18 +02:00
606fa74817
Adapt configuration files and fix old SGCT style in them
2020-04-14 10:47:59 +02:00
eedd0f75e0
Compile fix
2020-04-13 10:40:31 +02:00
0dc2fc9430
Make OpenSpace work with the new SGCT version
2020-04-10 17:38:18 +02:00
5e29145395
Coding style cleanup
2020-02-14 19:37:06 +01:00
eaa1b5025f
cmake macos fixes
2020-02-12 23:38:21 -05:00
de24e81bda
Fix copyright header information
...
Remove TimelineView application
2020-02-12 22:36:11 +01:00
126f2ac4cf
Check for selfinclusion of assets ( closes #1032 )
...
Make sure that OpenSpace doesn't crash when bailing out early
2020-02-11 14:09:14 +01:00
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
9cb1169d58
Merge pull request #1063 from OpenSpace/bug/macosbuild
...
macos compile and build (still needs ring shader const fix)
2020-02-10 23:39:39 +01:00
d8e9db76a3
Update the copyright header to 2020
2020-02-10 21:51:01 +01:00
db8a0d16c9
Merge branch 'master' into bug/macosbuild
2020-02-10 15:43:44 -05:00
49c793d976
Update Ghoul version
...
Add initial Tracy profiling macros
2020-02-10 14:50:41 +01:00
d2ae5f1ca2
Fix rendering issue due to uninitialized variables
2020-02-10 11:27:02 +01:00
9491f73803
More GLM initialization fixes
2020-02-10 01:18:27 +01:00
24ce773da9
Update GLM version
...
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
1c35459ba9
Update SGCT and Ghoul repository to newest stable version
2020-02-04 09:46:43 +01:00
04ce540102
Merge pull request #870 from OpenSpace/issue/848
...
Bring back stars to the Earth's night.
2020-01-30 14:56:39 -05:00
12b04f38bd
macos compile and build (still needs ring shader const fix)
2020-01-29 21:43:06 -05:00
6a94b2267e
Merge pull request #1053 from OpenSpace/feature/profile
...
Feature/profile
2020-01-27 16:18:01 -05:00
6dcaa9e299
Merged master.
2020-01-27 14:26:21 -05:00
b545ab5c5b
Merge pull request #1050 from OpenSpace/issue/1049
...
Fixed issue 1049 and 554 (multiple viewport problems and lua console scales)
2020-01-27 17:32:56 +01:00
f682352b53
Merging with master
2020-01-27 09:14:35 -07:00
182857cfb8
Update Ghoul and SGCT repositories
2020-01-24 19:38:27 +01:00
e3b3aec1ed
Fixed issue 1049(using first viewport size as framebuffer size) and 554(loading and ending screen will be visible on the first viewport only). Also fixed such that Lua Console adapts to window size and not framebuffer size.
2020-01-24 15:53:29 +01:00
d125694062
Reset SGCT to a commit that exists
2020-01-10 16:16:42 +01:00
797c674f12
Moved profile-to-asset conversion to openspaceengine and using temp dir
2019-12-20 14:12:25 -07:00
8feb6d1d2b
Small cleanup
...
Make sure OpenSpace compiles in debug mode
2019-12-17 10:57:37 +01:00
a33057d830
Feature/integrated touchserver ( #1015 )
...
* WINDOWS: Touch server integrated into module
The touch server functionality has been integrated into the touch module
which is enabled by-default when the touch module is used on a windows
build.
The touch-hook checks for a connected digitizer (pen or touchscreen, but
I haven't tested pen)
This commit should also fix two potential low-risk race conditions in
the tuioear.cpp file.
* Added comment regarding which window we use
* Added copyright notice on the win32_touch files
Also changed from #pragma to #ifndef
* Fixes based on review
- Added anonymous namespace
- Put win32hook in openspace namespace
- Fixed indentations and linebreaks
- Fixed an issue regarding global state deinitialization
2019-12-02 14:09:15 +01:00
c469dd78a0
Update sgct
2019-11-11 11:20:17 +01:00
Alexander Bock