mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-27 22:49:39 -06:00
* In progress with new version of session recording * Session recording coding pass for both record and playback, not building yet. * Working on getting first build of prototype * Code changes to get playback working with all 3 timing modes * Fixing session recording interactions with the timemanager * Bug fixes for newly discovered timing issues, mothballing recording of timing updates * Fixed camera jitter issue * Updated new reference to latest ghoul * Got session recording/playback working with changes made in master * Added threshold for differences in camera movement as criteria for saving to recording file * Added support for binary file for session recording/playback * Minor changes with handling timeManager keyframes in playback * New timeline structure & keyframes specific to session recording * Fixed bug with fixed-script size * Switched to new timeline specific to session recording, bug fixes, currently debugging camera position & rotation * Formatting changes only * Fixed scripts not working after timeline change * Add session recording test scene * Fixed problem with re-running the same playback multiple times * Fixed problems with camera interpolation * Fixed detection of camera playback finishing, and improved camera interpolation * Added comments for interface of externInteraction include * Fixed view frustum culling issues in session playback due to not appropiate camera scaling. Also made function in datamessagestructures to read and write this data to streams. * Added camera scaling fix to code that supports Ascii format * Added startPlayback default command for playing back while forcing simulation time to match the recording * Fixed camera jump in sessionRecording after playback finished. Cleanup in playback of camera to re-use same functionality in keyframenavigator. * Superb fix to sessionRecording. Realized focusNode of globalNavigationHandler needed to be activly update when camera change for either position of camera to be accurate or for rendered objects to be calculated without precision issues. Can now achieve a correct playback, even close to chunks/renderable, which was not possible before. * sessionRecording cleanup, fixed all warnings and renamed files to lowercase to match current standards. * Added error handling for bad input playback filename, protection from corrupted playback file * Implemented code review changes on pull request #737 for sessionRecording
136 lines
5.6 KiB
C++
136 lines
5.6 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2018 *
|
|
* *
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
|
|
* software and associated documentation files (the "Software"), to deal in the Software *
|
|
* without restriction, including without limitation the rights to use, copy, modify, *
|
|
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
|
|
* permit persons to whom the Software is furnished to do so, subject to the following *
|
|
* conditions: *
|
|
* *
|
|
* The above copyright notice and this permission notice shall be included in all copies *
|
|
* or substantial portions of the Software. *
|
|
* *
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
|
|
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
|
|
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
|
|
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
|
|
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
|
****************************************************************************************/
|
|
|
|
#ifndef __OPENSPACE_CORE___NAVIGATIONHANDLER___H__
|
|
#define __OPENSPACE_CORE___NAVIGATIONHANDLER___H__
|
|
|
|
#include <openspace/properties/propertyowner.h>
|
|
|
|
#include <openspace/interaction/joystickcamerastates.h>
|
|
#include <openspace/properties/stringproperty.h>
|
|
#include <openspace/properties/scalar/boolproperty.h>
|
|
#include <openspace/util/mouse.h>
|
|
#include <openspace/util/keys.h>
|
|
|
|
namespace openspace {
|
|
class Camera;
|
|
class SceneGraphNode;
|
|
} // namespace openspace
|
|
|
|
namespace openspace::scripting { struct LuaLibrary; }
|
|
|
|
namespace openspace::interaction {
|
|
|
|
struct JoystickInputStates;
|
|
class KeyframeNavigator;
|
|
class OrbitalNavigator;
|
|
|
|
class NavigationHandler : public properties::PropertyOwner {
|
|
public:
|
|
NavigationHandler();
|
|
~NavigationHandler();
|
|
|
|
void initialize();
|
|
void deinitialize();
|
|
|
|
// Mutators
|
|
void setFocusNode(SceneGraphNode* node);
|
|
void setCamera(Camera* camera);
|
|
void resetCameraDirection();
|
|
void setInterpolationTime(float durationInSeconds);
|
|
|
|
void setCameraStateFromDictionary(const ghoul::Dictionary& cameraDict);
|
|
void updateCamera(double deltaTime);
|
|
void setEnableKeyFrameInteraction();
|
|
void setDisableKeyFrameInteraction();
|
|
void triggerPlaybackStart();
|
|
void stopPlayback();
|
|
|
|
// Accessors
|
|
ghoul::Dictionary cameraStateDictionary();
|
|
SceneGraphNode* focusNode() const;
|
|
glm::dvec3 focusNodeToCameraVector() const;
|
|
glm::quat focusNodeToCameraRotation() const;
|
|
Camera* camera() const;
|
|
const InputState& inputState() const;
|
|
const OrbitalNavigator& orbitalNavigator() const;
|
|
KeyframeNavigator& keyframeNavigator() const;
|
|
bool isKeyFrameInteractionEnabled() const;
|
|
float interpolationTime() const;
|
|
|
|
// Callback functions
|
|
void keyboardCallback(Key key, KeyModifier modifier, KeyAction action);
|
|
|
|
void mouseButtonCallback(MouseButton button, MouseAction action);
|
|
void mousePositionCallback(double x, double y);
|
|
void mouseScrollWheelCallback(double pos);
|
|
|
|
void setJoystickAxisMapping(int axis, JoystickCameraStates::AxisType mapping,
|
|
JoystickCameraStates::AxisInvert shouldInvert =
|
|
JoystickCameraStates::AxisInvert::No,
|
|
JoystickCameraStates::AxisNormalize shouldNormalize =
|
|
JoystickCameraStates::AxisNormalize::No
|
|
);
|
|
|
|
JoystickCameraStates::AxisInformation joystickAxisMapping(int axis) const;
|
|
|
|
void setJoystickAxisDeadzone(int axis, float deadzone);
|
|
float joystickAxisDeadzone(int axis) const;
|
|
|
|
void bindJoystickButtonCommand(int button, std::string command, JoystickAction action,
|
|
JoystickCameraStates::ButtonCommandRemote remote, std::string documentation);
|
|
|
|
void clearJoystickButtonCommand(int button);
|
|
std::vector<std::string> joystickButtonCommand(int button) const;
|
|
|
|
|
|
|
|
void saveCameraStateToFile(const std::string& filepath);
|
|
void restoreCameraStateFromFile(const std::string& filepath);
|
|
|
|
/**
|
|
* \return The Lua library that contains all Lua functions available to affect the
|
|
* interaction
|
|
*/
|
|
static scripting::LuaLibrary luaLibrary();
|
|
|
|
private:
|
|
bool _cameraUpdatedFromScript = false;
|
|
bool _playbackModeEnabled = false;
|
|
|
|
std::unique_ptr<InputState> _inputState;
|
|
Camera* _camera = nullptr;
|
|
std::function<void()> _playbackEndCallback;
|
|
|
|
std::unique_ptr<OrbitalNavigator> _orbitalNavigator;
|
|
std::unique_ptr<KeyframeNavigator> _keyframeNavigator;
|
|
|
|
properties::StringProperty _origin;
|
|
properties::BoolProperty _useKeyFrameInteraction;
|
|
};
|
|
|
|
} // namespace openspace::interaction
|
|
|
|
#endif // __OPENSPACE_CORE___NAVIGATIONHANDLER___H__
|