Skip to content
This repository has been archived by the owner on Apr 29, 2024. It is now read-only.

Commit

Permalink
[linux] fix headers for Linux, including <d3dx9.h>
Browse files Browse the repository at this point in the history
  • Loading branch information
q4a committed Jun 6, 2022
1 parent 3515646 commit 587fb6a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libs/animation/src/action_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "action_info.h"
#include "storm_assert.h"
#include "storm/string_compare.hpp"
#include "storm_platform.h"

// ============================================================================================
// Construction, destruction
Expand Down
6 changes: 6 additions & 0 deletions src/libs/common/include/matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
#include "c_vector.h"
#include "math3d/matrix.h"
#include <d3d9.h>
#ifdef _WIN32 // for Effects (see libs/location/src/grass.cpp)
#include <d3dx9.h>
#endif

//============================================================================================

Expand Down Expand Up @@ -161,7 +163,9 @@ class CMatrix
void BuildMirrorMatrix(float Nx, float Ny, float Nz, float D);

// D3D extends (return (D3DXMATRIX *)pointer)
#ifdef _WIN32 // for Effects (see libs/location/src/grass.cpp)
operator D3DXMATRIX *() const;
#endif
operator D3DMATRIX *() const;
operator const float *() const;
};
Expand Down Expand Up @@ -892,11 +896,13 @@ inline void CMatrix::BuildMirrorMatrix(float Nx, float Ny, float Nz, float D)
m[3][3] = 1.0f;
}

#ifdef _WIN32 // for Effects (see libs/location/src/grass.cpp)
// D3D extends (return (D3DXMATRIX *)pointer)
inline CMatrix::operator D3DXMATRIX *() const
{
return ((D3DXMATRIX *)matrix);
};
#endif

// D3D extends (return (D3DMATRIX *)pointer)
inline CMatrix::operator D3DMATRIX *() const
Expand Down
1 change: 1 addition & 0 deletions src/libs/common/include/rands.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <random>
#include <climits>

// returns random float
inline float rand(float r)
Expand Down

0 comments on commit 587fb6a

Please sign in to comment.