mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 08:51:26 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,366 Commits 81 Branches 46 Tags
8aac7d6400a723735bf3c8aa2665eee7fb42bedf
Commit Graph

605 Commits

Author SHA1 Message Date
Emma Broman
193923e33b Merge branch 'master' into thesis/2018/exoplanets 2020-09-23 09:56:41 +02:00
Alexander Bock
98bfee301d Various Xcode compile fixes 2020-09-14 10:38:46 +02:00
Emma Broman
2aa31abe45 Merge branch 'master' into thesis/2018/exoplanets 2020-09-11 13:43:01 +02:00
Jonathas Costa
9b8f2a8efc Added missing header to fix compilation on Linux. 2020-09-08 11:07:51 -04:00
Alexander Bock
af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache 
# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp
 2020-09-04 14:02:17 +02:00
Emma Broman
99720d95ca Helper file for exoplanet data structure and replace magic numbers with constants 2020-08-28 16:31:48 +02:00
Alexander Bock
2cca451898 Coding style adaptations 
Adapt to changes in Ghoul
 2020-08-25 13:47:03 +02:00
Jonathas Costa
25cd3fdc0b Merged master again. 2020-08-24 13:44:26 -04:00
Alexander Bock
95db615dab Merge branch 'master' into feature/general-performance 2020-08-24 15:09:45 +02:00
Emma Broman
f8a31d11cc Cleanup 2020-08-24 11:32:32 +02:00
Emma Broman
a636faeaac Add option to immediately set delta time step, without interpolation 2020-08-24 11:32:32 +02:00
Emma Broman
4293fad3e9 Add server topic for delta times and send data to GUI 2020-08-24 11:32:31 +02:00
Emma Broman
457dabe9b7 Add list of delta time steps, stepping functions and keybindings 2020-08-24 11:32:31 +02:00
Alexander Bock
f1b05c23e7 Prevent Stack corruption 2020-08-21 15:40:52 +02:00
Jonathas Costa
f0c397d6be Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet). 2020-08-20 15:34:40 -04:00
Alexander Bock
1547609dad Remove dynamic memory allocations from the quantize function 2020-08-20 14:15:13 +02:00
Alexander Bock
dc63946fef Expose the const char* functionality for Spice to prevent unnecessary string creation 2020-08-20 11:08:49 +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
6ac5d536fa Update Ghoul repository 
Adapt to Ghoul changes in MemoryPool
 2020-08-19 16:19:25 +02:00
Alexander Bock
2621e16ec4 Pass the format string for the ephemeris conversion as a string_view to prevent an extra memory allocation 2020-08-19 11:12:45 +02:00
Alexander Bock
b16ee5b35a Adapt to changes in Ghoul regarding string_view 
Fix compile error if Trace logging is not enabled
Limit the number of threads to a maximum of 4 for asset initialization
 2020-08-18 10:07:38 +02:00
Alexander Bock
5091fa7ddb Using a fixed number of chunktiles in the chunktilepile as they number has to be 1 or 3 2020-08-13 17:50:22 +02:00
Alexander Bock
cabb962f6a Use temporary memory arena to create unsorted list of tiles, preventing dynamic memory allocations 2020-08-13 16:48:18 +02:00
Alexander Bock
38eac377e8 Introduce the date library 2020-08-13 10:47:30 +02:00
Alexander Bock
b78d1dd033 Merge branch 'master' into feature/memory-allocations 
# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h
 2020-08-05 19:06:04 +02:00
Alexander Bock
6e9db78f40 Remove performance measurements that have been supersceded by using Tracy 2020-08-05 18:28:08 +02:00
Alexander Bock
696bc31861 Moving over more allocations to the memory pool 2020-08-05 11:19:09 +02:00
Alexander Bock
25247c7a37 Create SceneGraphNodes in memory pool 2020-08-05 10:46:16 +02:00
Alexander Bock
e783807d66 Next step towards enabling a managed memory version of templatefactory 2020-08-04 21:56:39 +02:00
Alexander Bock
c3cb10453b Intermediate commit 2020-08-04 01:11:00 +02:00
Alexander Bock
3a1bec6e7d Merge branch 'master' into feature/license 2020-06-12 17:36:31 +02: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
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
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
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
Mikael
1c57f8ad21 Added more explanatory comments of the Touch-implementation 2020-03-25 10:01:56 +01: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
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +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
Mikael Pettersson
b96fa43b27 Changed glm include path 2020-02-07 13:25:08 +01:00
Mikael Pettersson
4e75b161db Feature/internal touchhandling (#1038) 
* Removal of dead code and compiler warnings

* Added basic internal touch

This commit only adds the description-shell of the touch implementation

* Added callbacks and first WIP of internal touch

Makes use of the TouchInput/TouchInputs class in the TouchModule.
Internally we cache the TouchInputs as an input deque and utilizes it
for motion-vectors.
This commit has bugs and issues, which will be worked upon.

* Happy new year!

Bumped year on branch-local files

* Improvements to internal touch

Almost reached feature-parity with tuio-handled touch events

- Added most of the touch-logic to touchinteraction
- Added helper functions to new TouchInput/TouchInputs classes

* Naming changes to touch interface

* Translate TUIO to TouchInput

This commit translates TUIO messages to an internal TouchInput structure
while still trying to keep feature parity.
Removed TUIO-dependencies from many files.
Changed behavior on tuioear to lock-swap its content.

* Minor cleanup and fixes

- Should fix touch roll
- Simplified some functions

* Build fix

* Use internal touch in webgui

- Added consume-logic to touch callbacks
- Constrained touch-input to either webgui or 3D application as mouse is
  - This fixes some flaws with previous implementation,
    such as ghost inputs

- Initialize touchmodule through init-functions rather than constructor

* Cleanup of comments

* Simplified touch classes

Added timestamp through constructor meaning no more sprinkled timestamps
Renamed TouchInputs to TouchInputHolder for clarity
Added helper functions to the Holder to see if it holds an input
Remade addInput as tryAddInput which return true on successful insertion
+ other cleanup

* Code style cleanup and tweaks

Removed avoidable zero-comparison for code clarity
Cleanup of code style

* Added comments to DirectInputSolver

Clarifying the use of the DirectInputSolver.

* Changes for coding style
Change SGCT version to make it checkout-able

* Clarify magic bitmask

* const -> constexpr const for magic bitmasks

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
 2020-01-13 08:27:13 +01: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
liuloppan
78eb673611 Feature/gui for touch (#967) 
Merging in feature gui for touch. Enable touch module to run.
Currently only run on development mode with the "touch" scene.
 2019-09-18 23:49:51 +02:00
Emil Axelsson
93c6bf3429 Add missing operators 2019-08-27 16:49:56 +02:00
Emil Axelsson
a53581d6c6 Cancel request when the version checker is destructed 2019-08-23 14:32:11 +02:00
Emil Axelsson
a25106886b Cancel version check when application closes 2019-08-23 14:19:24 +02:00