TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 18:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

standard order should reflect temp-hpr-fix

Browse Source
This commit is contained in:
David Rose 2003-07-02 22:38:02 +00:00
parent 08ae030917
commit 2d221eadb2
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/egg/eggXfmSAnim.I
View File

@ -158,7 +158,11 @@ get_order() const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const string &EggXfmSAnim:: INLINE const string &EggXfmSAnim::
get_standard_order() { get_standard_order() {
return _standard_order; if (temp_hpr_fix) {
return _standard_order_hpr_fix;
} else {
return _standard_order_legacy;
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

10
panda/src/egg/eggXfmSAnim.cxx
View File

@ -22,20 +22,20 @@
#include "eggParameters.h" #include "eggParameters.h"
#include "config_egg.h" #include "config_egg.h"
#include <indent.h> #include "indent.h"
#include <compose_matrix.h> #include "compose_matrix.h"
#include <math.h> #include <math.h>
TypeHandle EggXfmSAnim::_type_handle; TypeHandle EggXfmSAnim::_type_handle;
//string EggXfmSAnim::_standard_order = "srpht";
// For now, the standard order is sphrt. This matches the old, // For now, the standard order is sphrt. This matches the old,
// incorrect behavior of decompose_matrix(). When we have a new // incorrect behavior of decompose_matrix(). When we have a new
// egg-optchar, we can safely remove the old decompose_matrix() and // egg-optchar, we can safely remove the old decompose_matrix() and
// restore the correct standard order (above). // restore the correct standard order.
const string EggXfmSAnim::_standard_order = "sphrt"; const string EggXfmSAnim::_standard_order_legacy = "sphrt";
const string EggXfmSAnim::_standard_order_hpr_fix = "srpht";
// These are the table ID's of all tables we support, in the order we // These are the table ID's of all tables we support, in the order we
// expect to write them to the egg file. // expect to write them to the egg file.

7
panda/src/egg/eggXfmSAnim.h
View File

@ -20,9 +20,9 @@
#define EGGXFMSANIM_H #define EGGXFMSANIM_H
#include <pandabase.h> #include "pandabase.h"
#include "eggGroupNode.h" #include "eggGroupNode.h"
#include "config_linmath.h" // for temp_hpr_fix
class EggXfmAnimData; class EggXfmAnimData;
@ -92,7 +92,8 @@ private:
string _order; string _order;
CoordinateSystem _coordsys; CoordinateSystem _coordsys;
static const string _standard_order; static const string _standard_order_legacy;
static const string _standard_order_hpr_fix;
static const string _table_ids; static const string _table_ids;
static const int _num_table_ids; static const int _num_table_ids;