formatting

This commit is contained in:
Dave Schuyler 2003-10-28 00:42:02 +00:00
parent fe3b009d2b
commit ee418ad4bb
9 changed files with 35 additions and 35 deletions

View File

@ -19,7 +19,7 @@
#ifndef MOVINGPARTBASE_H #ifndef MOVINGPARTBASE_H
#define MOVINGPARTBASE_H #define MOVINGPARTBASE_H
#include <pandabase.h> #include "pandabase.h"
#include "partGroup.h" #include "partGroup.h"
#include "partBundle.h" #include "partBundle.h"

View File

@ -19,7 +19,7 @@
#ifndef __CHANLAYOUT_H__ #ifndef __CHANLAYOUT_H__
#define __CHANLAYOUT_H__ #define __CHANLAYOUT_H__
#include <pandabase.h> #include "pandabase.h"
#include "pmap.h" #include "pmap.h"
#include "pvector.h" #include "pvector.h"

View File

@ -19,7 +19,7 @@
#ifndef __CHANPARSE_H__ #ifndef __CHANPARSE_H__
#define __CHANPARSE_H__ #define __CHANPARSE_H__
#include <pandabase.h> #include "pandabase.h"
#include <string> #include <string>

View File

@ -19,7 +19,7 @@
#ifndef __CHANSETUP_H__ #ifndef __CHANSETUP_H__
#define __CHANSETUP_H__ #define __CHANSETUP_H__
#include <pandabase.h> #include "pandabase.h"
#include <vector_string.h> #include <vector_string.h>

View File

@ -24,20 +24,20 @@ class EXPCL_PANDA ChanViewport {
private: private:
float _left, _right, _bottom, _top; float _left, _right, _bottom, _top;
INLINE ChanViewport(void); INLINE ChanViewport();
public: public:
INLINE ChanViewport(float, float, float, float); INLINE ChanViewport(float, float, float, float);
INLINE ChanViewport(const ChanViewport&); INLINE ChanViewport(const ChanViewport&);
INLINE ~ChanViewport(void); INLINE ~ChanViewport();
INLINE ChanViewport& operator=(const ChanViewport&); INLINE ChanViewport& operator=(const ChanViewport&);
INLINE float left(void) const; INLINE float left() const;
INLINE float right(void) const; INLINE float right() const;
INLINE float bottom(void) const; INLINE float bottom() const;
INLINE float top(void) const; INLINE float top() const;
}; };
#include <pandabase.h> #include "pandabase.h"
#include "chanviewport.I" #include "chanviewport.I"

View File

@ -19,7 +19,7 @@
#ifndef __CHANWINDOW_H__ #ifndef __CHANWINDOW_H__
#define __CHANWINDOW_H__ #define __CHANWINDOW_H__
#include <pandabase.h> #include "pandabase.h"
#include "pmap.h" #include "pmap.h"
#include "pvector.h" #include "pvector.h"
@ -35,26 +35,26 @@ private:
SetupSyms _setups; SetupSyms _setups;
PTA(int) _camera_group; PTA(int) _camera_group;
public: public:
INLINE WindowItem(void); INLINE WindowItem();
INLINE WindowItem(const bool, const bool, const int, const std::string&, INLINE WindowItem(const bool, const bool, const int, const std::string&,
const SetupSyms&, const int, const int, const bool, const SetupSyms&, const int, const int, const bool,
const bool, PTA(int) ); const bool, PTA(int) );
INLINE WindowItem(const WindowItem&); INLINE WindowItem(const WindowItem&);
INLINE ~WindowItem(void); INLINE ~WindowItem();
INLINE WindowItem& operator=(const WindowItem&); INLINE WindowItem& operator=(const WindowItem&);
INLINE bool getHWChans(void) const; INLINE bool getHWChans() const;
INLINE bool getDVR(void) const; INLINE bool getDVR() const;
INLINE bool getBorder(void) const; INLINE bool getBorder() const;
INLINE bool getCursor(void) const; INLINE bool getCursor() const;
INLINE int getChanOffset(void) const; INLINE int getChanOffset() const;
INLINE int getSizeX(void) const; INLINE int getSizeX() const;
INLINE int getSizeY(void) const; INLINE int getSizeY() const;
INLINE std::string getLayout(void) const; INLINE std::string getLayout() const;
INLINE SetupSyms getSetups(void) const; INLINE SetupSyms getSetups() const;
INLINE int getCameraGroup(int display_region) const; INLINE int getCameraGroup(int display_region) const;
INLINE int getNumCameraGroups(void) const; INLINE int getNumCameraGroups() const;
}; };
typedef pmap<std::string, WindowItem> WindowType; typedef pmap<std::string, WindowItem> WindowType;

View File

@ -19,9 +19,9 @@
#ifndef CHARACTERSLIDER_H #ifndef CHARACTERSLIDER_H
#define CHARACTERSLIDER_H #define CHARACTERSLIDER_H
#include <pandabase.h> #include "pandabase.h"
#include <movingPartScalar.h> #include "movingPartScalar.h"
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : CharacterSlider // Class : CharacterSlider
@ -40,7 +40,7 @@ public:
virtual PartGroup *make_copy() const; virtual PartGroup *make_copy() const;
static void register_with_read_factory(void); static void register_with_read_factory();
static TypedWritable *make_CharacterSlider(const FactoryParams &params); static TypedWritable *make_CharacterSlider(const FactoryParams &params);

View File

@ -19,10 +19,10 @@
#ifndef COMPUTEDVERTICESMORPH_H #ifndef COMPUTEDVERTICESMORPH_H
#define COMPUTEDVERTICESMORPH_H #define COMPUTEDVERTICESMORPH_H
#include <pandabase.h> #include "pandabase.h"
#include <vector_typedWritable.h> #include "vector_typedWritable.h"
#include <luse.h> #include "luse.h"
class CharacterSlider; class CharacterSlider;
class BamReader; class BamReader;
@ -42,7 +42,7 @@ public:
typedef LVector2f VecType; typedef LVector2f VecType;
INLINE ComputedVerticesMorphValue2(int index, const VecType &mvector); INLINE ComputedVerticesMorphValue2(int index, const VecType &mvector);
INLINE ComputedVerticesMorphValue2(void); INLINE ComputedVerticesMorphValue2();
ushort _index; ushort _index;
VecType _vector; VecType _vector;
@ -63,7 +63,7 @@ public:
typedef LVector3f VecType; typedef LVector3f VecType;
INLINE ComputedVerticesMorphValue3(int index, const VecType &mvector); INLINE ComputedVerticesMorphValue3(int index, const VecType &mvector);
INLINE ComputedVerticesMorphValue3(void); INLINE ComputedVerticesMorphValue3();
ushort _index; ushort _index;
VecType _vector; VecType _vector;
@ -84,7 +84,7 @@ public:
typedef LVector4f VecType; typedef LVector4f VecType;
INLINE ComputedVerticesMorphValue4(int index, const VecType &mvector); INLINE ComputedVerticesMorphValue4(int index, const VecType &mvector);
INLINE ComputedVerticesMorphValue4(void); INLINE ComputedVerticesMorphValue4();
ushort _index; ushort _index;
VecType _vector; VecType _vector;

View File

@ -19,8 +19,8 @@
#ifndef CONFIG_CHAR_H #ifndef CONFIG_CHAR_H
#define CONFIG_CHAR_H #define CONFIG_CHAR_H
#include <pandabase.h> #include "pandabase.h"
#include <notifyCategoryProxy.h> #include "notifyCategoryProxy.h"
// CPPParser can't handle token-pasting to a keyword. // CPPParser can't handle token-pasting to a keyword.
#ifndef CPPPARSER #ifndef CPPPARSER