From 465c6aecffe6c1b0fd948de5c3c1a1ef3c90f06c Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 27 Jan 2003 22:56:37 +0000 Subject: [PATCH] includes --- pandatool/src/eggcharbase/eggBackPointer.h | 10 +++++----- pandatool/src/eggcharbase/eggCharacterCollection.h | 2 ++ pandatool/src/eggcharbase/eggCharacterData.cxx | 2 +- pandatool/src/eggcharbase/eggCharacterData.h | 8 ++++---- pandatool/src/eggcharbase/eggComponentData.cxx | 2 +- pandatool/src/eggcharbase/eggComponentData.h | 4 ++-- pandatool/src/eggcharbase/eggJointData.h | 4 ++-- pandatool/src/eggcharbase/eggJointNodePointer.h | 6 +++--- pandatool/src/eggcharbase/eggJointPointer.h | 4 ++-- pandatool/src/eggcharbase/eggMatrixTablePointer.h | 8 ++++---- pandatool/src/eggcharbase/eggVertexPointer.h | 6 +++--- 11 files changed, 29 insertions(+), 27 deletions(-) diff --git a/pandatool/src/eggcharbase/eggBackPointer.h b/pandatool/src/eggcharbase/eggBackPointer.h index c63e458a38..695fbbe13d 100644 --- a/pandatool/src/eggcharbase/eggBackPointer.h +++ b/pandatool/src/eggcharbase/eggBackPointer.h @@ -26,11 +26,11 @@ //////////////////////////////////////////////////////////////////// // Class : EggBackPointer // Description : This stores a pointer from an EggJointData or -// EggSlider object back to the referencing data in an -// egg file. One of these objects corresponds to each -// model appearing in an egg file, and may reference -// either a single node, or a table, or a slew of -// vertices and primitives, depending on the type of +// EggSliderData object back to the referencing data in +// an egg file. One of these objects corresponds to +// each model appearing in an egg file, and may +// reference either a single node, or a table, or a slew +// of vertices and primitives, depending on the type of // data stored. // // This is just an abstract base class. The actual diff --git a/pandatool/src/eggcharbase/eggCharacterCollection.h b/pandatool/src/eggcharbase/eggCharacterCollection.h index a0c912b6d7..688c1bcb2e 100644 --- a/pandatool/src/eggcharbase/eggCharacterCollection.h +++ b/pandatool/src/eggcharbase/eggCharacterCollection.h @@ -92,6 +92,8 @@ private: void add_morph_back_pointers(EggAttributes *attrib, EggObject *egg_object, int model_index, EggCharacterData *char_data); + // The _top_egg_nodes member is only used temporarily, when adding + // each pre-existing egg file to the structure for the first time. typedef pvector EggNodeList; typedef pmap TopEggNodes; typedef pmap TopEggNodesByName; diff --git a/pandatool/src/eggcharbase/eggCharacterData.cxx b/pandatool/src/eggcharbase/eggCharacterData.cxx index 0f9b1c2aca..74fa624588 100644 --- a/pandatool/src/eggcharbase/eggCharacterData.cxx +++ b/pandatool/src/eggcharbase/eggCharacterData.cxx @@ -21,7 +21,7 @@ #include "eggJointData.h" #include "eggSliderData.h" -#include +#include "indent.h" //////////////////////////////////////////////////////////////////// // Function: EggCharacterData::Constructor diff --git a/pandatool/src/eggcharbase/eggCharacterData.h b/pandatool/src/eggcharbase/eggCharacterData.h index cad8263cd1..e3903f88f6 100644 --- a/pandatool/src/eggcharbase/eggCharacterData.h +++ b/pandatool/src/eggcharbase/eggCharacterData.h @@ -19,13 +19,13 @@ #ifndef EGGCHARACTERDATA_H #define EGGCHARACTERDATA_H -#include +#include "pandatoolbase.h" #include "eggJointData.h" -#include -#include -#include +#include "eggNode.h" +#include "pointerTo.h" +#include "namable.h" #include "pmap.h" diff --git a/pandatool/src/eggcharbase/eggComponentData.cxx b/pandatool/src/eggcharbase/eggComponentData.cxx index 66b569e279..8c24acc9dc 100644 --- a/pandatool/src/eggcharbase/eggComponentData.cxx +++ b/pandatool/src/eggcharbase/eggComponentData.cxx @@ -19,7 +19,7 @@ #include "eggComponentData.h" #include "eggBackPointer.h" -#include +#include "indent.h" //////////////////////////////////////////////////////////////////// diff --git a/pandatool/src/eggcharbase/eggComponentData.h b/pandatool/src/eggcharbase/eggComponentData.h index 37c1f53c4e..8e69826b47 100644 --- a/pandatool/src/eggcharbase/eggComponentData.h +++ b/pandatool/src/eggcharbase/eggComponentData.h @@ -19,9 +19,9 @@ #ifndef EGGCOMPONENTDATA_H #define EGGCOMPONENTDATA_H -#include +#include "pandatoolbase.h" -#include +#include "namable.h" class EggCharacterCollection; class EggCharacterData; diff --git a/pandatool/src/eggcharbase/eggJointData.h b/pandatool/src/eggcharbase/eggJointData.h index 16fcad6923..4b55eae4c0 100644 --- a/pandatool/src/eggcharbase/eggJointData.h +++ b/pandatool/src/eggcharbase/eggJointData.h @@ -19,11 +19,11 @@ #ifndef EGGJOINTDATA_H #define EGGJOINTDATA_H -#include +#include "pandatoolbase.h" #include "eggComponentData.h" -#include +#include "luse.h" //////////////////////////////////////////////////////////////////// // Class : EggJointData diff --git a/pandatool/src/eggcharbase/eggJointNodePointer.h b/pandatool/src/eggcharbase/eggJointNodePointer.h index 8be47f8e4e..494ba7b389 100644 --- a/pandatool/src/eggcharbase/eggJointNodePointer.h +++ b/pandatool/src/eggcharbase/eggJointNodePointer.h @@ -19,12 +19,12 @@ #ifndef EGGJOINTNODEPOINTER_H #define EGGJOINTNODEPOINTER_H -#include +#include "pandatoolbase.h" #include "eggJointPointer.h" -#include -#include +#include "eggGroup.h" +#include "pointerTo.h" //////////////////////////////////////////////////////////////////// // Class : EggJointNodePointer diff --git a/pandatool/src/eggcharbase/eggJointPointer.h b/pandatool/src/eggcharbase/eggJointPointer.h index ff8c74b678..53e654d9c2 100644 --- a/pandatool/src/eggcharbase/eggJointPointer.h +++ b/pandatool/src/eggcharbase/eggJointPointer.h @@ -19,11 +19,11 @@ #ifndef EGGJOINTPOINTER_H #define EGGJOINTPOINTER_H -#include +#include "pandatoolbase.h" #include "eggBackPointer.h" -#include +#include "luse.h" //////////////////////////////////////////////////////////////////// // Class : EggJointPointer diff --git a/pandatool/src/eggcharbase/eggMatrixTablePointer.h b/pandatool/src/eggcharbase/eggMatrixTablePointer.h index a6f66fa0f5..c903d17c3d 100644 --- a/pandatool/src/eggcharbase/eggMatrixTablePointer.h +++ b/pandatool/src/eggcharbase/eggMatrixTablePointer.h @@ -19,13 +19,13 @@ #ifndef EGGMATRIXTABLEPOINTER_H #define EGGMATRIXTABLEPOINTER_H -#include +#include "pandatoolbase.h" #include "eggJointPointer.h" -#include -#include -#include +#include "eggTable.h" +#include "eggXfmSAnim.h" +#include "pointerTo.h" //////////////////////////////////////////////////////////////////// // Class : EggMatrixTablePointer diff --git a/pandatool/src/eggcharbase/eggVertexPointer.h b/pandatool/src/eggcharbase/eggVertexPointer.h index cbdfc4094a..c37fd74a4f 100644 --- a/pandatool/src/eggcharbase/eggVertexPointer.h +++ b/pandatool/src/eggcharbase/eggVertexPointer.h @@ -19,12 +19,12 @@ #ifndef EGGVERTEXPOINTER_H #define EGGVERTEXPOINTER_H -#include +#include "pandatoolbase.h" #include "eggBackPointer.h" -#include -#include +#include "eggGroup.h" +#include "pointerTo.h" //////////////////////////////////////////////////////////////////// // Class : EggVertexPointer