Commit Graph

99 Commits

Author SHA1 Message Date
Joakim Kilby 9a74bd60b7 renamed osparallelconnection to parallel connection. Updated all files and CMakeLists to use new name.
started rebase work on parallel connection
2015-06-24 11:23:36 +02:00
Joakim Kilby e42d160773 added interpolation and mutex protection
changed TCP protocol to no delay
2015-06-17 15:11:34 +02:00
Joakim Kilby 8297f2e683 First test of actual remote controlling 2015-06-17 13:10:19 +02:00
Joakim Kilby 4e4cf4cd6a temporarily removed references to keyframes in interactionhandler.
changed how keyframes are encoded/decoded and sent in osparallelconnection
2015-06-17 11:18:50 +02:00
Joakim Kilby 9d6b9a3ad1 adding first version of keyframe functionality for interactionhandler 2015-06-17 09:52:12 +02:00
Joakim Kilby cce351af69 removed all references to remotecontroller 2015-06-17 08:39:02 +02:00
Joakim Kilby f35ec6f8d4 Removed remotecontroller class 2015-06-17 08:38:25 +02:00
Joakim Kilby 1bcf11412e adding remotecontroller class, changes to CMake to include it and (temporary) functionality to use it, should be declared in CFG file 2015-06-04 12:53:32 +02:00
Alexander Bock f1e6ad6f3d Remove more warnings 2015-05-23 22:42:51 +02:00
Alexander Bock 597ed14014 Fixing CREDITS file
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
Alexander Bock 79f3052887 More work on SceneGraphLoader
Renamed SceneGraph to Scene
Added new class SceneGraph to handle scenegraph related tasks
2015-04-09 21:43:13 +02:00
Alexander Bock b6e0bd1043 Added interaction speed modifiers/inverters
Disable cotire
Enable Xcursor and Xinerama libraries on Linux builds
2015-02-23 15:58:05 +01:00
Alexander Bock 8a57db4d55 Changed behavior in LuaConsole autocomplete to only autocomplete until the next separator 2015-02-17 21:24:57 +01:00
Alexander Bock a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Joakim Kilby 1cfabe6a2d Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT 2015-02-17 08:25:09 +01:00
Alexander Bock 7286ba3ded Added Autocompletion for the LuaConsole (TAB/Shift+TAB) 2015-02-17 00:43:11 +01:00
Joakim Kilby a3ff828e91 Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/updateSGCT
Conflicts:
	src/engine/openspaceengine.cpp
2015-02-16 08:33:01 +01:00
Alexander Bock 86b754f313 Clean up of LuaConsole class 2015-02-15 17:56:07 +01:00
Alexander Bock 55f7b0fc03 Move 'keys' file from interaction to util 2015-02-15 17:55:44 +01:00
Alexander Bock f583eaee2a Started cleanup work on LuaConsole, moved Clipboard functions into Ghoul 2015-02-14 11:37:29 +01:00
Joakim Kilby a8abfa74bd Added proper synchronization for mouse controller and camera.
Camera class now contains three instances of synched variables. a local copy changed on master. a shared copy only used for sharing in serialize/deserialize. and finally a synched copy never written to except in post sync
2015-02-10 11:34:12 +01:00
Joakim Kilby fe0cd2c130 Added call to update of MouseController in update function.
Added distance and orbit functions.
modified setRotation function to actually set rotation of camera (was empty)
2015-02-06 11:22:34 +01:00
Joakim Kilby f7171e1936 Added update function for all mouse controller objects.
Added OrbitalMouseController class
2015-02-06 11:21:02 +01:00
Alexander Bock cf53b5c1b0 Let the LuaConsole use a permanent cached file for the history 2014-12-05 16:43:16 +01:00
Jonas Strandstedt 69ce7c9e00 Fix LuaConsole history issues
- Fix bug when adding command when history is empty
- Fixed loading of history from file
2014-12-02 11:48:15 +01:00
jonasstrandstedt 561aa221d3 Linux fixes
- Commented out the tinythread hack from src/CMakeLists.txt
2014-11-20 09:33:07 +01:00
Alexander Bock 73143b8b47 Reenable methods for limiting closeness to focus object
Renable key binding feature that was broken by merging
2014-11-18 19:40:24 +01:00
Alexander Bock 432266ee6a Allow access to the console through OpenSpaceEngine
Enable scripting for showing/hiding the console
2014-11-18 19:39:25 +01:00
Alexander Bock e630f6efbb Fixed bug that did not set cache directory correctly
Moved visibility of console into LuaConsole class
2014-11-18 17:47:09 +01:00
Alexander Bock 6b40cb18fb Merge branch 'feature/interactionhandler' into develop
Conflicts:
	include/openspace/engine/openspaceengine.h
	include/openspace/interaction/interactionhandler.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
2014-11-18 15:46:26 +01:00
Jonas Strandstedt 31c76f3e3c Added key binding from Lua possible
- Possible to add key bindings from Lua possible. This calls Lua scripts
  from key commands.

 - Temporary fixed a small bug for volume rendering
2014-11-17 17:02:40 +01:00
Jonas Strandstedt ea3c5e8d11 More cleanup 2014-10-24 13:34:03 +02:00
Jonas Strandstedt 5225323a2b Cleaning up OpenSpaceEngine and RenderEngine 2014-10-23 18:13:40 +02:00
Jonas Strandstedt a8f3923659 Moved the lua command input to separete class
- Added functionality for keeping the input history
2014-10-22 13:04:55 +02:00
Jonas Strandstedt 0e52e759db Improved interaction for distance and origin 2014-10-21 17:04:58 +02:00
Alexander Bock 86efb3573b More work in preparing for lua-based keyboard controller
Modified ScriptManager to decouple adding libraries from registering libraries
Allowing ScriptManager to register libraries to other lua states as well
2014-10-14 00:08:26 +02:00
Alexander Bock 0518e8cf02 Added fixed key mapping to KeyboardControl fixed
Cleanup of code
2014-10-13 10:29:04 +02:00
Alexander Bock c41b1b178a Added missing commit 2014-10-13 00:43:36 +02:00
Alexander Bock ff62c06320 Installed new InteractionHandler 2014-10-13 00:39:46 +02:00
Alexander Bock d62e6296aa More work on converting the old InteractionHandler to new methods 2014-10-13 00:27:20 +02:00
Alexander Bock d67c9ffe8d Started changes for InteractionManager 2014-10-12 23:51:33 +02:00
Alexander Bock bedc894064 Removing Jenkins warnings 2014-09-26 17:53:18 +02:00
Jonas Strandstedt e99a98224c Working ABuffer
- Fixed the ABuffer rendering for intersecting volumes
- Added keyboard callback for toggling renderables
- Changed textures from ClampToBorder to ClampToEdge
- Fixed transferfunctions to clamp to edge instead of fade to black
2014-07-23 16:06:49 -04:00
Alexander Bock 3520bd121e Renamed pss to PowerScaledScalar 2014-05-11 18:34:57 +02:00
Alexander Bock 40a2cb1068 Renamed psc to powerscaledcoordinate and pss to powerscaledscalar 2014-05-11 14:32:42 +02:00
Hans-Christian Helltegen a9e6291313 More trackball and camera work. Interaction is restricted to rotation around y 2014-05-02 11:59:23 -04:00
Hans-Christian Helltegen a80c5d45d4 More trackball/camera work 2014-04-28 16:02:27 -04:00
Hans-Christian Helltegen ed93372c8b Started work on trackball-functionality in interactionhandler 2014-04-23 16:55:49 -04:00
Jonas Strandstedt 89eeae62d0 Restructuring for OpenSpace tests
- Moved all OpenSpace headers to separate include directory
- Added OpenSpaceTests binary with OPENSPACE_HAVE_TESTS define
- Added CMake setting of BASE_DIR
- Added OpenSpace initial tests for SceneGraph and SceneGraphNodes
- Added OpenSpace initial tests for psc and pss
- Restructured OpenSpace so no GL functions are called in constructors
to make the classes testable

- Todo: Make the base dir possible to set through command line argument
and configuration file
2014-03-19 14:57:10 -04:00