Skip to content

Commit

Permalink
Reformat: xrCore
Browse files Browse the repository at this point in the history
  • Loading branch information
@invokr
invokr committed Jan 15, 2017
1 parent eea17cc commit ef48491
Show file tree
Hide file tree
Showing 206 changed files with 18,439 additions and 17,346 deletions.
240 changes: 121 additions & 119 deletions src/xrCore/Animation/Bone.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@

#include "Bone.hpp"

#define BONE_VERSION 0x0002
#define BONE_VERSION 0x0002
//------------------------------------------------------------------------------
#define BONE_CHUNK_VERSION 0x0001
#define BONE_CHUNK_DEF 0x0002
#define BONE_CHUNK_BIND_POSE 0x0003
#define BONE_CHUNK_MATERIAL 0x0004
#define BONE_CHUNK_SHAPE 0x0005
#define BONE_CHUNK_IK_JOINT 0x0006
#define BONE_CHUNK_MASS 0x0007
#define BONE_CHUNK_FLAGS 0x0008
#define BONE_CHUNK_IK_JOINT_BREAK 0x0009
#define BONE_CHUNK_IK_JOINT_FRICTION 0x0010

#define BONE_CHUNK_VERSION 0x0001
#define BONE_CHUNK_DEF 0x0002
#define BONE_CHUNK_BIND_POSE 0x0003
#define BONE_CHUNK_MATERIAL 0x0004
#define BONE_CHUNK_SHAPE 0x0005
#define BONE_CHUNK_IK_JOINT 0x0006
#define BONE_CHUNK_MASS 0x0007
#define BONE_CHUNK_FLAGS 0x0008
#define BONE_CHUNK_IK_JOINT_BREAK 0x0009
#define BONE_CHUNK_IK_JOINT_FRICTION 0x0010

static const Fobb dummy = Fobb().identity();

Expand All @@ -27,12 +26,12 @@ const Fobb& CBone::get_obb() const
CBone::CBone()
{
construct();
flags.zero ();
rest_length = 0;
SelfID = -1;
parent = 0;
flags.zero();
rest_length = 0;
SelfID = -1;
parent = 0;

ResetData ();
ResetData();
}

CBone::~CBone()
Expand All @@ -41,153 +40,156 @@ CBone::~CBone()

void CBone::ResetData()
{
IK_data.Reset ();
game_mtl = "default_object";
shape.Reset ();
IK_data.Reset();
game_mtl = "default_object";
shape.Reset();

mass = 10.f;;
center_of_mass.set(0.f,0.f,0.f);
mass = 10.f;
;
center_of_mass.set(0.f, 0.f, 0.f);
}

void CBone::Save(IWriter& F)
{
F.open_chunk (BONE_CHUNK_VERSION);
F.w_u16 (BONE_VERSION);
F.close_chunk ();
F.open_chunk (BONE_CHUNK_DEF);
F.w_stringZ (name);
F.w_stringZ (parent_name);
F.w_stringZ (wmap);
F.close_chunk ();

F.open_chunk (BONE_CHUNK_BIND_POSE);
F.w_fvector3 (rest_offset);
F.w_fvector3 (rest_rotate);
F.w_float (rest_length);
F.close_chunk ();

SaveData (F);
F.open_chunk(BONE_CHUNK_VERSION);
F.w_u16(BONE_VERSION);
F.close_chunk();

F.open_chunk(BONE_CHUNK_DEF);
F.w_stringZ(name);
F.w_stringZ(parent_name);
F.w_stringZ(wmap);
F.close_chunk();

F.open_chunk(BONE_CHUNK_BIND_POSE);
F.w_fvector3(rest_offset);
F.w_fvector3(rest_rotate);
F.w_float(rest_length);
F.close_chunk();

SaveData(F);
}

void CBone::Load_0(IReader& F)
{
F.r_stringZ (name); xr_strlwr(name);
F.r_stringZ (parent_name); xr_strlwr(parent_name);
F.r_stringZ (wmap);
F.r_fvector3 (rest_offset);
F.r_fvector3 (rest_rotate);
rest_length = F.r_float();
std::swap (rest_rotate.x,rest_rotate.y);
Reset ();
F.r_stringZ(name);
xr_strlwr(name);
F.r_stringZ(parent_name);
xr_strlwr(parent_name);
F.r_stringZ(wmap);
F.r_fvector3(rest_offset);
F.r_fvector3(rest_rotate);
rest_length = F.r_float();
std::swap(rest_rotate.x, rest_rotate.y);
Reset();
}

void CBone::Load_1(IReader& F)
{
R_ASSERT(F.find_chunk(BONE_CHUNK_VERSION));
u16 ver = F.r_u16();
u16 ver = F.r_u16();

if ((ver != 0x0001) && (ver != BONE_VERSION)) return;

if ((ver!=0x0001)&&(ver!=BONE_VERSION))
return;

R_ASSERT(F.find_chunk(BONE_CHUNK_DEF));
F.r_stringZ (name); xr_strlwr(name);
F.r_stringZ (parent_name); xr_strlwr(parent_name);
F.r_stringZ (wmap);
F.r_stringZ(name);
xr_strlwr(name);
F.r_stringZ(parent_name);
xr_strlwr(parent_name);
F.r_stringZ(wmap);

R_ASSERT(F.find_chunk(BONE_CHUNK_BIND_POSE));
F.r_fvector3 (rest_offset);
F.r_fvector3 (rest_rotate);
rest_length = F.r_float();

if (ver==0x0001)
std::swap (rest_rotate.x,rest_rotate.y);

LoadData (F);
F.r_fvector3(rest_offset);
F.r_fvector3(rest_rotate);
rest_length = F.r_float();

if (ver == 0x0001) std::swap(rest_rotate.x, rest_rotate.y);

LoadData(F);
}

void CBone::SaveData(IWriter& F)
{
F.open_chunk (BONE_CHUNK_DEF);
F.w_stringZ (name);
F.close_chunk ();

F.open_chunk (BONE_CHUNK_MATERIAL);
F.w_stringZ (game_mtl);
F.close_chunk ();

F.open_chunk (BONE_CHUNK_SHAPE);
F.w (&shape,sizeof(SBoneShape));
F.close_chunk ();
F.open_chunk (BONE_CHUNK_FLAGS);
F.w_u32 (IK_data.ik_flags.get());
F.close_chunk ();

F.open_chunk (BONE_CHUNK_IK_JOINT);
F.w_u32 (IK_data.type);
F.w (IK_data.limits,sizeof(SJointLimit)*3);
F.w_float (IK_data.spring_factor);
F.w_float (IK_data.damping_factor);
F.close_chunk ();

F.open_chunk (BONE_CHUNK_IK_JOINT_BREAK);
F.w_float (IK_data.break_force);
F.w_float (IK_data.break_torque);
F.close_chunk ();

F.open_chunk (BONE_CHUNK_IK_JOINT_FRICTION);
F.w_float (IK_data.friction);
F.close_chunk ();

F.open_chunk (BONE_CHUNK_MASS);
F.w_float (mass);
F.w_fvector3 (center_of_mass);
F.close_chunk ();
F.open_chunk(BONE_CHUNK_DEF);
F.w_stringZ(name);
F.close_chunk();

F.open_chunk(BONE_CHUNK_MATERIAL);
F.w_stringZ(game_mtl);
F.close_chunk();

F.open_chunk(BONE_CHUNK_SHAPE);
F.w(&shape, sizeof(SBoneShape));
F.close_chunk();

F.open_chunk(BONE_CHUNK_FLAGS);
F.w_u32(IK_data.ik_flags.get());
F.close_chunk();

F.open_chunk(BONE_CHUNK_IK_JOINT);
F.w_u32(IK_data.type);
F.w(IK_data.limits, sizeof(SJointLimit) * 3);
F.w_float(IK_data.spring_factor);
F.w_float(IK_data.damping_factor);
F.close_chunk();

F.open_chunk(BONE_CHUNK_IK_JOINT_BREAK);
F.w_float(IK_data.break_force);
F.w_float(IK_data.break_torque);
F.close_chunk();

F.open_chunk(BONE_CHUNK_IK_JOINT_FRICTION);
F.w_float(IK_data.friction);
F.close_chunk();

F.open_chunk(BONE_CHUNK_MASS);
F.w_float(mass);
F.w_fvector3(center_of_mass);
F.close_chunk();
}

void CBone::LoadData(IReader& F)
{
R_ASSERT(F.find_chunk(BONE_CHUNK_DEF));
F.r_stringZ (name); xr_strlwr(name);
F.r_stringZ(name);
xr_strlwr(name);

R_ASSERT(F.find_chunk(BONE_CHUNK_MATERIAL));
F.r_stringZ (game_mtl);
F.r_stringZ(game_mtl);

R_ASSERT(F.find_chunk(BONE_CHUNK_SHAPE));
F.r (&shape,sizeof(SBoneShape));

if (F.find_chunk(BONE_CHUNK_FLAGS))
IK_data.ik_flags.assign(F.r_u32());
F.r(&shape, sizeof(SBoneShape));

if (F.find_chunk(BONE_CHUNK_FLAGS)) IK_data.ik_flags.assign(F.r_u32());

R_ASSERT(F.find_chunk(BONE_CHUNK_IK_JOINT));
IK_data.type = (EJointType)F.r_u32();
F.r (IK_data.limits,sizeof(SJointLimit)*3);
IK_data.spring_factor = F.r_float();
IK_data.damping_factor = F.r_float();
IK_data.type = (EJointType)F.r_u32();
F.r(IK_data.limits, sizeof(SJointLimit) * 3);
IK_data.spring_factor = F.r_float();
IK_data.damping_factor = F.r_float();

if (F.find_chunk(BONE_CHUNK_IK_JOINT_BREAK)){
if (F.find_chunk(BONE_CHUNK_IK_JOINT_BREAK)) {
IK_data.break_force = F.r_float();
IK_data.break_torque= F.r_float();
IK_data.break_torque = F.r_float();
}

if (F.find_chunk(BONE_CHUNK_IK_JOINT_FRICTION)){
IK_data.friction = F.r_float();
if (F.find_chunk(BONE_CHUNK_IK_JOINT_FRICTION)) {
IK_data.friction = F.r_float();
}

if (F.find_chunk(BONE_CHUNK_MASS)){
mass = F.r_float();
if (F.find_chunk(BONE_CHUNK_MASS)) {
mass = F.r_float();
F.r_fvector3(center_of_mass);
}
}

void CBone::CopyData(CBone* bone)
{
game_mtl = bone->game_mtl;
shape = bone->shape;
IK_data = bone->IK_data;
mass = bone->mass;
center_of_mass = bone->center_of_mass;
game_mtl = bone->game_mtl;
shape = bone->shape;
IK_data = bone->IK_data;
mass = bone->mass;
center_of_mass = bone->center_of_mass;
}

void CBoneInstance::set_param(u32 idx, float data)
Expand Down
Loading

0 comments on commit ef48491

Please sign in to comment.