Jonathan Bosson
b66d1f32c4
merge with develop
2017-03-14 16:39:15 -06:00
Jonathan Bosson
868ac5c6a6
first pass on roll (only uses three finger and x-pos atm), Friction and sensitivities are now part of struct ScaleFactor, sensitivities of zoom and globalRot scales with distance to focus node
2017-03-14 16:27:01 -06:00
Jonathan Bosson
1fa5220e3c
minor changes during meeting
2017-03-14 12:44:43 -06:00
Alexander Bock
c6fbf6902a
OSX compile fix
2017-03-14 11:16:43 -04:00
Jonathan Bosson
bb050d5056
small modifications to sensitivity and panning
2017-03-13 23:09:17 -06:00
Alexander Bock
b74bff45cb
Allow an Image SequenceParser to not return target times (used for the HongKang parser not returning any if Lorri is ignored
2017-03-13 11:23:42 -04:00
Alexander Bock
0d157ac165
Let FloatProperty and derived properties render at higher resolution in Onscreen GUI
2017-03-13 11:17:52 -04:00
Alexander Bock
d61bb20992
Some more work on RenderableFov
...
Make registerting path tokens through Lua scripts work
2017-03-13 09:52:06 -04:00
Alexander Bock
ea4d9c8e44
Cleanup of RenderableCrawlingLine
...
Cleanup of RenderableFOV
Add function to SpiceManager that does not return the light travel time
2017-03-12 16:05:14 -04:00
Alexander Bock
dc40812df9
Fix warnings in code
...
Make OpenSpaceTest not flood the console on Jenkins
Fix Vec3 property to signal change correctly
Let RenderablePlanetProject correctly reload base map and height map
Update Ghoul
2017-03-11 11:26:25 -05:00
Jonathan Bosson
88db722006
ugly minHeightFromSurface check on focus node (only earth)
2017-03-10 16:18:15 -07:00
Jonathan Bosson
6b0b2070ef
panning kinda works
2017-03-10 15:48:44 -07:00
Jonathan Bosson
b1e507ce2b
small cleanup and bugfix on gotNewInput()
2017-03-10 14:23:06 -07:00
Jonathan Bosson
7339b7c006
global rotation is now also based on velocity and friction. the input only adds to the specific velocity its interaction corresponds to
2017-03-10 13:45:52 -07:00
Alexander Bock
6e9d8103ac
Do not enable KameleonVolume and ToyVolume on default to limit dependencies
2017-03-10 09:32:57 -05:00
Alexander Bock
bcf92804b6
Updating Ghoul repository
...
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Jonathan Bosson
fc2a9b03d2
zooming now uses velocity to move the camera, rotation works with one touch input although currently with a direct new position
2017-03-09 14:43:18 -07:00
Jonathan Bosson
cc269d6aff
build fix on touchinteraction header file
2017-03-08 21:09:06 -07:00
Jonathan Bosson
9532e998b0
cleanup with using namespace in header files, start of new interaction class for touch input
2017-03-08 20:43:17 -07:00
Jonathan Bosson
1451d26851
Include right directories on posix files as well
2017-03-07 10:48:22 -07:00
Jonathan Bosson
436da23cd2
Include posix files in lubTUIO if its built on a UNIX unit. Small cleanup in touchmodule
2017-03-07 10:24:07 -07:00
Emil Axelsson
d92d001364
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
2017-03-07 13:19:07 +01:00
Emil Axelsson
7da999c332
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
...
Conflicts:
include/openspace/engine/openspaceengine.h
src/engine/openspaceengine.cpp
src/engine/settingsengine.cpp
src/engine/syncengine.cpp
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/scenegraph.cpp
src/scene/scenegraphnode.cpp
tests/test_scenegraphloader.inl
2017-03-07 10:57:50 +01:00
Alexander Bock
78ae311a1f
Fix length of RenderableFov when target is not in field-of-view
2017-03-06 15:56:13 -05:00
Alexander Bock
403bb3c144
Compile fix for new property enum specification
2017-03-06 09:56:44 -05:00
Alexander Bock
dcc9d6228d
Some minor cleanup
2017-03-05 20:08:24 -05:00
Alexander Bock
9b92a4e9ca
Reenable Hybridparser ( closes #221 )
2017-03-05 18:46:31 -05:00
Alexander Bock
6aa774283d
Make Labelparser more robust by ignoring whitespaces
2017-03-05 17:46:29 -05:00
Alexander Bock
34f1b55c3c
Enable shifting the meridian of a RenderablePlanetProjection by 180 for Pluto
2017-03-05 17:26:22 -05:00
Alexander Bock
b6ddf2a879
Fix clang compile error regarding std::abs
2017-03-04 20:53:13 -05:00
Alexander Bock
63af7e67f9
Make the WindowWrapper a PropertyOwner and add SGCT properties to the subclass ( closes #260 )
2017-03-03 18:39:35 -05:00
Alexander Bock
8e0a37fb7a
Compile fixes related to change in documentation namespace
...
Configuration fix, making the default scene default again
2017-03-03 17:51:39 -05:00
Jonathan Bosson
4a2d70b88d
merge with develop for jenkins build messages
2017-03-03 12:10:41 -07:00
Emil Axelsson
d7cd3a01a5
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume
...
Conflicts:
src/engine/openspaceengine.cpp
2017-03-03 18:08:29 +01:00
Emil Axelsson
b32c416615
Improvements from code review
2017-03-03 17:39:23 +01:00
Alexander Bock
9d30d3323b
Update Ghoul repository
...
Adapt to changed signature of ghoul_assert macro
2017-03-03 10:55:20 -05:00
Alexander Bock
fb67e805ac
Various cleanup
...
Add script that counts the number of includes
2017-03-02 19:50:05 -05:00
Alexander Bock
1689dc4047
Move the PropertyOwner name specification into the constructor and adjust accordingly
2017-03-02 18:25:13 -05:00
Jonathan Bosson
dbc5f806f4
isMaster no longer exists
2017-03-02 15:57:36 -07:00
Jonathan Bosson
4b8111439c
merge with develop
2017-03-02 15:49:54 -07:00
Alexander Bock
aba3536caa
Don't assert if the focus node is not found if there are no nodes at all
2017-03-02 17:32:20 -05:00
Jonathan Bosson
436d573c75
lastList is now a pair of id and the last frames TuioPoint. Makes check to only process if we get new input
2017-03-02 14:35:41 -07:00
Alexander Bock
d6b5bb753b
- Some cleanup of LuaConsole
...
- Moved dedicated Lua commands into a visible property
- Disallow non-ASCII characters
- Remove unused KeyboardController
- Remove unused DeviceIdentifier
- Some cleanup of LogFactory
- Move and use documentation into the class
2017-03-02 14:27:18 -05:00
Emil Axelsson
5faff1d3bf
Change to correct include guard name
2017-03-02 18:53:06 +01:00
Emil Axelsson
0377737843
Adapt to new interfaces
2017-03-02 18:53:05 +01:00
Emil Axelsson
c2fa08716b
Cleanup
2017-03-02 18:53:05 +01:00
Emil Axelsson
dd0d5d86af
Update branch to work with changes in develop
2017-03-02 18:53:03 +01:00
Emil Axelsson
442969f2b1
Jenkins compilation fix
2017-03-02 18:50:11 +01:00
Emil Axelsson
6cd91ef44c
Clean up volume rendering code
2017-03-02 18:20:06 +01:00
Emil Axelsson
17cc48621a
Fix inside volume rendering crash on certain platforms
2017-03-02 18:20:05 +01:00
