Skip to content
Snippets Groups Projects
Commit 1d5e01a3 authored by Amorilia's avatar Amorilia
Browse files

niflib: fixed bhkRigidBody and NiPalette for new xml

parent 0695b881
No related branches found
No related tags found
No related merge requests found
......@@ -123,10 +123,10 @@ vector<Color4> NiPalette::GetPalette() const {
for ( unsigned int i = 0; i < 256; ++i ) {
color_pal[i].r = float(palette[i][0]) / 255.0f;
color_pal[i].g = float(palette[i][1]) / 255.0f;
color_pal[i].b = float(palette[i][2]) / 255.0f;
color_pal[i].a = float(palette[i][3]) / 255.0f;
color_pal[i].r = float(palette[i].r) / 255.0f;
color_pal[i].g = float(palette[i].g) / 255.0f;
color_pal[i].b = float(palette[i].b) / 255.0f;
color_pal[i].a = float(palette[i].a) / 255.0f;
}
return color_pal;
......@@ -138,10 +138,10 @@ void NiPalette::SetPalette( const vector<Color4> & new_pal ) {
}
for ( unsigned int i = 0; i < 256; ++i ) {
palette[i][0] = int( new_pal[i].r * 255.0f );
palette[i][1] = int( new_pal[i].g * 255.0f );
palette[i][2] = int( new_pal[i].b * 255.0f );
palette[i][3] = int( new_pal[i].a * 255.0f );
palette[i].r = int( new_pal[i].r * 255.0f );
palette[i].g = int( new_pal[i].g * 255.0f );
palette[i].b = int( new_pal[i].b * 255.0f );
palette[i].a = int( new_pal[i].a * 255.0f );
}
}
......
......@@ -353,11 +353,35 @@ void bhkRigidBody::SetAngularVelocity( const Vector3 & value ) {
}
array<12,float> bhkRigidBody::GetInertia() const {
array<12, float> result;
result[0] = inertia.m11;
result[1] = inertia.m12;
result[2] = inertia.m13;
result[3] = inertia.m14;
result[4] = inertia.m21;
result[5] = inertia.m22;
result[6] = inertia.m23;
result[7] = inertia.m24;
result[8] = inertia.m31;
result[9] = inertia.m32;
result[10] = inertia.m33;
result[11] = inertia.m34;
return inertia;
}
void bhkRigidBody::SetInertia( const array<12,float>& value ) {
inertia = value;
inertia.m11 = value[0];
inertia.m12 = value[1];
inertia.m13 = value[2];
inertia.m14 = value[3];
inertia.m21 = value[4];
inertia.m22 = value[5];
inertia.m23 = value[6];
inertia.m24 = value[7];
inertia.m31 = value[8];
inertia.m32 = value[9];
inertia.m33 = value[10];
inertia.m34 = value[11];
}
Vector3 bhkRigidBody::GetCenter() const {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment