v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #291 from jonnenauha/dev 

Fixes for #284 and #290
pull/294/head
Alexander Gessler 2014-05-31 03:02:47 +02:00
parent 340b94f9a5 199d455261
commit 84eb1930ea
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssimpPCH.h
View File

@ -56,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw // Include our stdint.h replacement header for MSVC, take the global header for gcc/mingw
#if defined( _MSC_VER) && (_MSC_VER < 1600) #if defined( _MSC_VER) && (_MSC_VER < 1600)
# include "pstdint.h" # include "../include/assimp/Compiler/pstdint.h"
#else #else
# include <stdint.h> # include <stdint.h>
#endif #endif

2
code/CMakeLists.txt
View File

@ -10,7 +10,7 @@ SET( HEADER_PATH ../include/assimp )
SET( COMPILER_HEADERS SET( COMPILER_HEADERS
${HEADER_PATH}/Compiler/pushpack1.h ${HEADER_PATH}/Compiler/pushpack1.h
${HEADER_PATH}/Compiler/poppack1.h ${HEADER_PATH}/Compiler/poppack1.h
pstdint.h ${HEADER_PATH}/Compiler/pstdint.h
) )
SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS}) SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})

0
code/pstdint.h → include/assimp/Compiler/pstdint.h
View File

4
include/assimp/matrix4x4.h
View File

@ -84,8 +84,8 @@ public:
* @param rotation The rotation as a hamilton quaternion * @param rotation The rotation as a hamilton quaternion
* @param position The position for the x,y,z axes * @param position The position for the x,y,z axes
*/ */
aiMatrix4x4t(aiVector3t<TReal>& scaling, aiQuaterniont<TReal>& rotation, aiMatrix4x4t(const aiVector3t<TReal>& scaling, const aiQuaterniont<TReal>& rotation,
aiVector3t<TReal>& position); const aiVector3t<TReal>& position);
public: public:

2
include/assimp/matrix4x4.inl
View File

@ -109,7 +109,7 @@ inline aiMatrix4x4t<TReal>::aiMatrix4x4t (const aiMatrix3x3t<TReal>& m)
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template <typename TReal> template <typename TReal>
inline aiMatrix4x4t<TReal>::aiMatrix4x4t (aiVector3t<TReal>& scaling, aiQuaterniont<TReal>& rotation, aiVector3t<TReal>& position) inline aiMatrix4x4t<TReal>::aiMatrix4x4t (const aiVector3t<TReal>& scaling, const aiQuaterniont<TReal>& rotation, const aiVector3t<TReal>& position)
{ {
// build a 3x3 rotation matrix // build a 3x3 rotation matrix
aiMatrix3x3t<TReal> m = rotation.GetMatrix(); aiMatrix3x3t<TReal> m = rotation.GetMatrix();

2
include/assimp/metadata.h
View File

@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assert.h> #include <assert.h>
#if defined(_MSC_VER) && (_MSC_VER <= 1500) #if defined(_MSC_VER) && (_MSC_VER <= 1500)
#include "pstdint.h" #include "Compiler/pstdint.h"
#else #else
#include <stdint.h> #include <stdint.h>
#endif #endif