| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "config.h" | 5 #include "config.h" | 
| 6 #include "modules/vr/VRPositionState.h" | 6 #include "modules/vr/VRPositionState.h" | 
| 7 | 7 | 
| 8 namespace blink { | 8 namespace blink { | 
| 9 | 9 | 
| 10 namespace { | 10 namespace { | 
| 11 | 11 | 
| 12 DOMPoint* VecToDomPoint(const blink::WebVRVector4& vec, bool valid) | 12 DOMPoint* VecToDomPoint(const WebVRVector4& vec, bool valid) | 
| 13 { | 13 { | 
| 14     if (valid) | 14     if (valid) | 
| 15         return DOMPoint::create(vec.x, vec.y, vec.z, vec.w); | 15         return DOMPoint::create(vec.x, vec.y, vec.z, vec.w); | 
| 16     return nullptr; | 16     return nullptr; | 
| 17 } | 17 } | 
| 18 DOMPoint* VecToDomPoint(const blink::WebVRVector3& vec, bool valid) | 18 DOMPoint* VecToDomPoint(const WebVRVector3& vec, bool valid) | 
| 19 { | 19 { | 
| 20     if (valid) | 20     if (valid) | 
| 21         return DOMPoint::create(vec.x, vec.y, vec.z, 0.0); | 21         return DOMPoint::create(vec.x, vec.y, vec.z, 0.0); | 
| 22     return nullptr; | 22     return nullptr; | 
| 23 } | 23 } | 
| 24 | 24 | 
| 25 } // namespace | 25 } // namespace | 
| 26 | 26 | 
| 27 VRPositionState::VRPositionState() | 27 VRPositionState::VRPositionState() | 
| 28     : m_timeStamp(0.0) | 28     : m_timeStamp(0.0) | 
| 29 { | 29 { | 
| 30 } | 30 } | 
| 31 | 31 | 
| 32 void VRPositionState::setState(const blink::WebHMDSensorState &state) | 32 void VRPositionState::setState(const WebHMDSensorState &state) | 
| 33 { | 33 { | 
| 34     m_timeStamp = state.timestamp; | 34     m_timeStamp = state.timestamp; | 
| 35     m_orientation = VecToDomPoint(state.orientation, state.flags & WebVRSensorSt
    ateOrientation); | 35     m_orientation = VecToDomPoint(state.orientation, state.flags & WebVRSensorSt
    ateOrientation); | 
| 36     m_position = VecToDomPoint(state.position, state.flags & WebVRSensorStatePos
    ition); | 36     m_position = VecToDomPoint(state.position, state.flags & WebVRSensorStatePos
    ition); | 
| 37     m_angularVelocity = VecToDomPoint(state.angularVelocity, state.flags & WebVR
    SensorStateAngularVelocity); | 37     m_angularVelocity = VecToDomPoint(state.angularVelocity, state.flags & WebVR
    SensorStateAngularVelocity); | 
| 38     m_linearVelocity = VecToDomPoint(state.linearVelocity, state.flags & WebVRSe
    nsorStateLinearVelocity); | 38     m_linearVelocity = VecToDomPoint(state.linearVelocity, state.flags & WebVRSe
    nsorStateLinearVelocity); | 
| 39     m_angularAcceleration = VecToDomPoint(state.angularAcceleration, state.flags
     & WebVRSensorStateAngularAcceleration); | 39     m_angularAcceleration = VecToDomPoint(state.angularAcceleration, state.flags
     & WebVRSensorStateAngularAcceleration); | 
| 40     m_linearAcceleration =  VecToDomPoint(state.linearAcceleration, state.flags 
    & WebVRSensorStateLinearAcceleration); | 40     m_linearAcceleration =  VecToDomPoint(state.linearAcceleration, state.flags 
    & WebVRSensorStateLinearAcceleration); | 
| 41 } | 41 } | 
| 42 | 42 | 
| 43 DEFINE_TRACE(VRPositionState) | 43 DEFINE_TRACE(VRPositionState) | 
| 44 { | 44 { | 
| 45     visitor->trace(m_orientation); | 45     visitor->trace(m_orientation); | 
| 46     visitor->trace(m_position); | 46     visitor->trace(m_position); | 
| 47     visitor->trace(m_angularVelocity); | 47     visitor->trace(m_angularVelocity); | 
| 48     visitor->trace(m_linearVelocity); | 48     visitor->trace(m_linearVelocity); | 
| 49     visitor->trace(m_angularAcceleration); | 49     visitor->trace(m_angularAcceleration); | 
| 50     visitor->trace(m_linearAcceleration); | 50     visitor->trace(m_linearAcceleration); | 
| 51 } | 51 } | 
| 52 | 52 | 
| 53 } // namespace blink | 53 } // namespace blink | 
| OLD | NEW | 
|---|