mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://reactphysics3d.googlecode.com/svn/trunk@283 92aac97c-a6ce-11dd-a772-7fcde58d38e6

Browse Source
This commit is contained in:
chappuis.daniel 2010-02-23 08:37:32 +00:00
parent e05ff5627c
commit 6e87a16e00
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sources/reactphysics3d/mathematics/Matrix.cpp
View File

@ -79,6 +79,27 @@ Matrix::Matrix(const Matrix& matrix)
}
}
// Conversion from Matrix3x3
Matrix::Matrix(const Matrix3x3& matrix)
:nbRow(3), nbColumn(3) {
// Create the two dimensional dynamic array
array = new double*[nbRow];
assert(array != 0); // Array pointer musn't be null
for(int i=0; i<nbRow; ++i) {
array[i] = new double[nbColumn];
}
// Copy the matrix
for (int i=0; i<nbRow; ++i) {
for(int j=0; j<nbColumn; ++j) {
setValue(i,j, matrix.getValue(i,j));
}
}
}
// Destructor of the class Matrix
Matrix::~Matrix() {
// Destruction of the dynamic array

2
sources/reactphysics3d/mathematics/Matrix.h
View File

@ -22,6 +22,7 @@
// Libraries
#include "exceptions.h"
#include "Matrix3x3.h"
#include <stdexcept>
#include <iostream>
@ -45,6 +46,7 @@ class Matrix {
Matrix(); // Constructor without argument
Matrix(int nbRow, int nbColum) throw(std::invalid_argument); // Constructor of the class Matrix
Matrix(const Matrix& matrix); // Copy constructor of the class Matrix
Matrix(const Matrix3x3& matrix); // Conversion from Matrix3x3
virtual ~Matrix(); // Destructor of the class Matrix
double getValue(int i, int j) const throw(std::invalid_argument); // Return a value in the matrix
void setValue(int i, int j, double value) throw(std::invalid_argument); // Set a value in the matrix