mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,996 Commits 82 Branches 46 Tags
52ca39fc228c892afdab33cf57f62fb5c3e9b231
Commit Graph

1748 Commits

Author SHA1 Message Date
Alexander Bock
52ca39fc22 Replace 'required' with 'require' and 'requested' with 'request' 
Continue the work of factoring out the serialization and deserialization of the profile files
 2020-06-17 09:33:41 +02:00
Alexander Bock
809ee9c753 Adding struct to hold parsed Profile 2020-06-16 16:39:51 +02:00
Alexander Bock
9d922f2634 Remove explicit read-in function 2020-06-16 13:22:19 +02:00
Alexander Bock
393e064874 Yet more cleanup 
Add ProfileError class
 2020-06-16 11:05:56 +02:00
Alexander Bock
d7e976f67f Add some more fixes 2020-06-15 16:07:50 +02:00
Alexander Bock
b64784b122 First small cleanup 2020-06-15 10:23:53 +02:00
Alexander Bock
f9d1b030ef Small cleanup 2020-06-14 18:34:52 +02:00
Alexander Bock
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
Alexander Bock
3a1bec6e7d Merge branch 'master' into feature/license 2020-06-12 17:36:31 +02:00
Alexander Bock
433d96bbb4 SGCT compile fix 
First pass for pull request
 2020-06-11 00:24:58 +02:00
GPayne
0f06f9d233 Merge branch 'master' into feature/profiles 2020-05-14 19:31:19 -06:00
GPayne
dfb61097b2 Finished testing new save-settings-to-profile feature 2020-05-14 13:20:05 -06:00
Alexander Bock
f7170a9506 Turn the scaling transformation into providing three scaling factors (x, y, z) 
Add NonUniformStaticScale class to provide independent scaling factors (closes #1151)
 2020-05-12 15:27:24 +02:00
Alexander Bock
3b427bfd15 Cleaning up window delegate 2020-05-10 15:17:51 +02:00
Alexander Bock
f605ea9422 Some more cleanup 2020-05-10 14:03:42 +02:00
Alexander Bock
d1e5670ce5 More cleanup of asset ownership 2020-05-09 18:33:01 +02:00
GPayne
fe24b0c446 Finished unit tests for profile save current feature 2020-05-07 15:39:50 -06:00
Alexander Bock
d3cce906c1 Memory hygiene cleanup 2020-05-07 13:08:34 +02:00
Alexander Bock
befef58e80 More cleanup 2020-05-06 21:54:02 +02:00
Alexander Bock
340444ce0d Cleanup AssetManager class 2020-05-06 21:40:23 +02:00
Alexander Bock
01f0a864dc Yet more cleanup of Asset-related files 2020-05-06 20:33:27 +02:00
Alexander Bock
fa56e9ecf4 Some more cleanup of the assets 2020-05-06 16:21:47 +02:00
GPayne
02fb61d95d Continued unit testing work 2020-05-05 20:57:54 -06:00
Alexander Bock
5a41084027 Add loading of meta information from assets 2020-05-05 00:29:46 +02:00
Alexander Bock
875404246f Add meta information to Asset class 2020-05-05 00:00:48 +02:00
Alexander Bock
b4eb168c76 Turning shared_ptr into pointers (part 1) 2020-05-04 23:21:18 +02:00
Alexander Bock
c8dff5c217 First pass of asset cleanup 2020-05-04 22:56:12 +02:00
Alexander Bock
498d125547 Merge pull request #1146 from OpenSpace/feature/sgct 
Merging the changes to make the new SGCT version the default one
 2020-05-04 10:48:48 +02:00
Alexander Bock
0fcd71be71 Add the ability to invert mouse buttons for OrbitalNavigator (closes #697) 2020-04-27 15:08:01 +02:00
GPayne
1fbb9e8acf Completed code for detecting and storing changes made since startup 2020-04-23 12:06:34 -06:00
GPayne
83ef5ed245 Switched profile-to-scene conversion from lua script to Profile class 2020-04-15 16:31:05 -06:00
Alexander Bock
f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Alexander Bock
0dc2fc9430 Make OpenSpace work with the new SGCT version 2020-04-10 17:38:18 +02:00
GPayne
3d96836ee1 Added unit tests for conversion from profile to scene 2020-04-07 20:39:31 -06:00
GPayne
924a0085a7 Additional work on converting from profile to scene/asset format 2020-04-05 21:47:51 -06:00
GPayne
5a6ff37759 Created unit tests for profileFile 2020-04-03 21:43:24 -06:00
Alexander Bock
c6d3a181b7 Merge pull request #1115 from OpenSpace/feature/continuous-pinch 
Feature/continuous pinch
 2020-03-28 20:34:33 +01:00
GPayne
207c7d5657 Profile file handler in progress 2020-03-27 15:10:46 -06:00
Mikael
1c57f8ad21 Added more explanatory comments of the Touch-implementation 2020-03-25 10:01:56 +01:00
GPayne
6253a5cf2e First pass on tracking changed properties/assets since initialization 2020-03-22 20:59:15 -06:00
Mikael Pettersson
fd0a9743a2 Touch: Added a firstInput so that if we ever get more than 
max amount of inputs in our Deque, we will still have our
first point stored (for pinching around a start-centroid mainly)
 2020-03-10 10:25:31 +01:00
Mikael Pettersson
b9210a65fd Changed (and simplified) some internal logic of the touch class 2020-03-10 09:52:30 +01:00
Stefan Seibert
6f63da86b4 Exposed linear flight factor as property 2020-02-18 10:59:29 +01:00
Alexander Bock
5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock
de24e81bda Fix copyright header information 
Remove TimelineView application
 2020-02-12 22:36:11 +01:00
Alexander Bock
b09b936293 Add property to disable all mouse input (closes #1022) 2020-02-12 21:19:01 +01:00
Alexander Bock
81fda6c8db Update Ghoul repository 
Adapt to changes in Ghoul
 2020-02-12 00:01:24 +01:00
Alexander Bock
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
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
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