Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions include/ICameraSceneNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
#ifndef __NBL_I_CAMERA_SCENE_NODE_H_INCLUDED__
#define __NBL_I_CAMERA_SCENE_NODE_H_INCLUDED__

#include <vectorSIMD.h>
#include <nbl/builtin/hlsl/cpp_compat/matrix.hlsl>

#include "ISceneNode.h"
#include "matrixutil.h"

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

//! Gets the current projection matrix of the camera.
/** \return The current projection matrix of the camera. */
inline const core::matrix4SIMD& getProjectionMatrix() const { return projMatrix; }
inline const hlsl::float32_t4x4& getProjectionMatrix() const { return projMatrix; }

//! Gets the current view matrix of the camera.
/** \return The current view matrix of the camera. */
virtual const core::matrix3x4SIMD& getViewMatrix() const =0;
virtual const hlsl::float32_t3x4& getViewMatrix() const =0;

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

// actual projection matrix used
core::matrix4SIMD projMatrix;
hlsl::float32_t4x4 projMatrix;

bool leftHanded;
};
Expand Down
263 changes: 0 additions & 263 deletions include/matrix3x4SIMD.h

This file was deleted.

Loading
Loading