Skip to content

Commit 1183da3

Browse files
committed
Removed core::matrixSIMD
1 parent 08ad78a commit 1183da3

35 files changed

+414
-1555
lines changed

include/ICameraSceneNode.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#ifndef __NBL_I_CAMERA_SCENE_NODE_H_INCLUDED__
77
#define __NBL_I_CAMERA_SCENE_NODE_H_INCLUDED__
88

9+
#include <vectorSIMD.h>
10+
#include <nbl/builtin/hlsl/cpp_compat/matrix.hlsl>
11+
912
#include "ISceneNode.h"
1013
#include "matrixutil.h"
1114

@@ -46,17 +49,17 @@ class ICameraSceneNode : public ISceneNode
4649
The function will figure it out if you've set an orthogonal matrix.
4750
\param projection The new projection matrix of the camera.
4851
*/
49-
virtual void setProjectionMatrix(const core::matrix4SIMD& projection) =0;
52+
virtual void setProjectionMatrix(const hlsl::float32_t4x4& projection) =0;
5053

5154
//! Gets the current projection matrix of the camera.
5255
/** \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; }
5457

5558
//! Gets the current view matrix of the camera.
5659
/** \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;
5861

59-
virtual const core::matrix4SIMD& getConcatenatedMatrix() const =0;
62+
virtual const hlsl::float32_t4x4& getConcatenatedMatrix() const =0;
6063
#if 0
6164
//! It is possible to send mouse and key events to the camera.
6265
/** Most cameras may ignore this input, but camera scene nodes
@@ -198,7 +201,7 @@ class ICameraSceneNode : public ISceneNode
198201
float ZFar; // Z-value of the far view-plane.
199202

200203
// actual projection matrix used
201-
core::matrix4SIMD projMatrix;
204+
hlsl::float32_t4x4 projMatrix;
202205

203206
bool leftHanded;
204207
};

include/matrix3x4SIMD.h

Lines changed: 0 additions & 263 deletions
This file was deleted.

0 commit comments

Comments
 (0)