501e980ff7
Cloned sgct from master
2020-05-20 17:26:26 +02:00
b2ca7ba957
trying to resolve sgct issues localy
2020-05-13 10:18:26 -04:00
534427a47f
.
2020-05-13 10:17:13 -04:00
542ce6d0b5
merging master to feature/mas-model
2020-05-06 17:00:11 -04: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
afb889ff82
Feature/serve screenshots ( #1003 )
...
* Take screnshots using lua function, returning screenshot number. Add screenshot endpoint.
* Change capitalization from screenShot to screenshot
* Fix screenshot filename collision bug when using multiple windows.
2019-11-01 10:41:59 +01:00
204966b0e0
Got OpenSpace parse and conversion working for profile-to-scene file, then successful run with this resulting scene.
2019-10-22 16:22:44 -06:00
e3a842b53f
Moving path to lua converter script
2019-10-21 15:38:45 -06:00
18810384dc
Initial commit of profiles, containing convert-to-scene script
2019-10-18 17:12:57 -06:00
d32b4d9f1f
Update Ghoul to fix the commandline parsing ( closes #950 )
2019-08-22 14:34:45 +02:00
dd76a9bd7b
Improve information presented for current frame number in stereo mode and when swap groups are used
2019-08-21 15:57:29 +02:00
c7c8375ca0
Coding style fixes
2019-07-31 11:13:29 +02:00
0e1bc9950d
Update SGCT to fix contrast/brightness issue
2019-07-31 10:12:33 +02:00
66cd0413dd
Cleanup of Wormhole application
...
Updated Ghoul to fix commandline argument extraction bug
2019-07-18 11:52:09 +02:00
64f8793ea0
minVR updates ( #908 )
...
* changed libopenspace cmake module name to openspace-core
* change mouse button callback to include modifiers
* added some new ghoul initialization from the non-MinVR main.cpp
* Add GLFW as an external dependency for MinVR
2019-07-16 13:51:39 +02:00
e9fdd31c56
Feature/flying fixes ( #924 )
...
* Removing various warnings
* Fix the rendering of the touchbar on Mac
* More warnings
* Add ghoul deinitialize
* Update SGCT repository
2019-07-04 09:28:42 +02:00
1308317b87
added viewport tracking to configs ( #895 )
...
* Added viewport tracking to configs; updated fov to match default window. cleanup of openspace.cfg
* Update SGCT
2019-06-03 03:27:51 -06:00
1f861d8ed5
Remove unused code
2019-05-27 10:47:23 +02:00
d0e9170658
Feature/cef cmake ( #873 )
...
* Expose `CMAKE_BUILD_TYPE` to cmake gui (for single configuration generators)
* Use generator expressions to get debug vs release mode
* Fix mac app icon
2019-05-18 22:50:00 +02:00
915d57f6f0
Add missing icon file
2019-05-17 17:29:36 -06:00
64298dea8c
Changes to SGCT and OpenSpace render engine to resolve issue #589 ( #865 )
...
* Added property for aspect ratio
* Working version with aspect ratio slider controlling the FOV, and also gets updated by a window resize.
* Created horizontal fov property / GUI control that preserves aspect ratio by adjusting vertical fov to match, and updates with window resizing.
2019-05-17 16:49:09 -06:00
Emilie