Skip to content

Commit

Permalink
resume #define DISABLING_PARAMS_H and MATH_UTILS_H. We need merge xrP…
Browse files Browse the repository at this point in the history
…hysics/DisablingParams.h + xrGame/DisablingParams.h and xrPhysics/MathUtils.h + xrGame/MathUtils.h
  • Loading branch information
q4a committed Sep 29, 2018
1 parent e62906c commit d3e0a10
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion src/xrPhysics/DisablingParams.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#ifndef DISABLING_PARAMS_H
#define DISABLING_PARAMS_H
#include "xrPhysics.h"

// fwd. decl.
Expand Down Expand Up @@ -28,3 +29,5 @@ struct SAllDDWParams
};

extern SAllDDWParams worldDisablingParams;

#endif
5 changes: 4 additions & 1 deletion src/xrPhysics/MathUtils.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#ifndef MATH_UTILS_H
#define MATH_UTILS_H
#include "xrCore/_fbox.h"
#include "xrCore/_obb.h"
#include "xrPhysics.h"
Expand Down Expand Up @@ -476,3 +477,5 @@ const float DET_CHECK_FATAL_EPS = 0.8f; // scale -35% !? ;)
#else
#define VERIFY_RMATRIX(M)
#endif

#endif // include guard

0 comments on commit d3e0a10

Please sign in to comment.