|
6 | 6 | #ifndef __NBL_I_CAMERA_SCENE_NODE_H_INCLUDED__ |
7 | 7 | #define __NBL_I_CAMERA_SCENE_NODE_H_INCLUDED__ |
8 | 8 |
|
| 9 | +#include <vectorSIMD.h> |
| 10 | +#include <nbl/builtin/hlsl/cpp_compat/matrix.hlsl> |
| 11 | + |
9 | 12 | #include "ISceneNode.h" |
10 | 13 | #include "matrixutil.h" |
11 | 14 |
|
@@ -46,17 +49,17 @@ class ICameraSceneNode : public ISceneNode |
46 | 49 | The function will figure it out if you've set an orthogonal matrix. |
47 | 50 | \param projection The new projection matrix of the camera. |
48 | 51 | */ |
49 | | - virtual void setProjectionMatrix(const core::matrix4SIMD& projection) =0; |
| 52 | + virtual void setProjectionMatrix(const hlsl::float32_t4x4& projection) =0; |
50 | 53 |
|
51 | 54 | //! Gets the current projection matrix of the camera. |
52 | 55 | /** \return The current projection matrix of the camera. */ |
53 | | - inline const core::matrix4SIMD& getProjectionMatrix() const { return projMatrix; } |
| 56 | + inline const hlsl::float32_t4x4& getProjectionMatrix() const { return projMatrix; } |
54 | 57 |
|
55 | 58 | //! Gets the current view matrix of the camera. |
56 | 59 | /** \return The current view matrix of the camera. */ |
57 | | - virtual const core::matrix3x4SIMD& getViewMatrix() const =0; |
| 60 | + virtual const hlsl::float32_t3x4& getViewMatrix() const =0; |
58 | 61 |
|
59 | | - virtual const core::matrix4SIMD& getConcatenatedMatrix() const =0; |
| 62 | + virtual const hlsl::float32_t4x4& getConcatenatedMatrix() const =0; |
60 | 63 | #if 0 |
61 | 64 | //! It is possible to send mouse and key events to the camera. |
62 | 65 | /** Most cameras may ignore this input, but camera scene nodes |
@@ -198,7 +201,7 @@ class ICameraSceneNode : public ISceneNode |
198 | 201 | float ZFar; // Z-value of the far view-plane. |
199 | 202 |
|
200 | 203 | // actual projection matrix used |
201 | | - core::matrix4SIMD projMatrix; |
| 204 | + hlsl::float32_t4x4 projMatrix; |
202 | 205 |
|
203 | 206 | bool leftHanded; |
204 | 207 | }; |
|
0 commit comments