[Csp-commits] APPLICATIONS/CSPSim/Include/Theater CustomLayoutModel.h,1.1,1.2 FeatureGroup.h,1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater
In directory sc8-pr-cvs1:/tmp/cvs-serv17617/Include/Theater

Modified Files:
	CustomLayoutModel.h FeatureGroup.h FeatureGroupList.h 
	FeatureLayout.h FeatureObjectModel.h FeatureQuad.h Objective.h 
	RandomBillboardModel.h RandomForestModel.h 
Log Message:


Index: CustomLayoutModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/CustomLayoutModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CustomLayoutModel.h	26 Jun 2003 09:25:45 -0000	1.1
--- CustomLayoutModel.h	20 Oct 2003 00:23:23 -0000	1.2
***************
*** 46,50 ****
  
  public:
! 	SIMDATA_OBJECT(CustomLayoutModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(CustomLayoutModel)
--- 46,50 ----
  
  public:
! 	SIMDATA_STATIC_OBJECT(CustomLayoutModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(CustomLayoutModel)
***************
*** 71,83 ****
  	virtual ~CustomLayoutModel();
  
! 	virtual void pack(simdata::Packer& p) const {
! 		FeatureGroupModel::pack(p);
! 		p.pack(m_FeatureLayout);
  	}
  
- 	virtual void unpack(simdata::UnPacker& p) {
- 		FeatureGroupModel::unpack(p);
- 		p.unpack(m_FeatureLayout);
- 	}
  };
  
--- 71,79 ----
  	virtual ~CustomLayoutModel();
  
! 	virtual void serialize(simdata::Archive &archive) {
! 		FeatureGroupModel::serialize(archive);
! 		archive(m_FeatureLayout);
  	}
  
  };
  

Index: FeatureGroup.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureGroup.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FeatureGroup.h	26 Jun 2003 09:25:45 -0000	1.1
--- FeatureGroup.h	20 Oct 2003 00:23:23 -0000	1.2
***************
*** 133,148 ****
  	virtual ~FeatureGroup();
  
! 	virtual void pack(simdata::Packer& p) const {
! 		Object::pack(p);
! 		p.pack(m_Model);
! 		p.pack(m_Position);
! 		p.pack(m_Orientation);
! 	}
! 
! 	virtual void unpack(simdata::UnPacker& p) {
! 		Object::unpack(p);
! 		p.unpack(m_Model);
! 		p.unpack(m_Position);
! 		p.unpack(m_Orientation);
  	}
  
--- 133,141 ----
  	virtual ~FeatureGroup();
  
! 	virtual void serialize(simdata::Archive &archive) {
! 		SimObject::serialize(archive);
! 		archive(m_Model);
! 		archive(m_Position);
! 		archive(m_Orientation);
  	}
  

Index: FeatureGroupList.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureGroupList.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FeatureGroupList.h	26 Jun 2003 09:25:45 -0000	1.1
--- FeatureGroupList.h	20 Oct 2003 00:23:23 -0000	1.2
***************
*** 46,50 ****
  public:
  
! 	SIMDATA_OBJECT(FeatureGroupList, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureGroupList)
--- 46,50 ----
  public:
  
! 	SIMDATA_STATIC_OBJECT(FeatureGroupList, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureGroupList)
***************
*** 56,67 ****
  	virtual ~FeatureGroupList();
  
! 	virtual void pack(simdata::Packer& p) const {
! 		Object::pack(p);
! 		p.pack(m_FeatureGroups);
! 	}
! 
! 	virtual void unpack(simdata::UnPacker& p) {
! 		Object::unpack(p);
! 		p.unpack(m_FeatureGroups);
  	}
  
--- 56,62 ----
  	virtual ~FeatureGroupList();
  
! 	virtual void serialize(simdata::Archive &archive) {
! 		Object::serialize(archive);
! 		archive(m_FeatureGroups);
  	}
  

Index: FeatureLayout.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureLayout.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FeatureLayout.h	22 Jul 2003 15:48:51 -0000	1.2
--- FeatureLayout.h	20 Oct 2003 00:23:23 -0000	1.3
***************
*** 109,129 ****
  	void makeFeatures(std::vector<Feature> &features, int value) const;
  
! 	virtual void pack(simdata::Packer& p) const {
! 		Object::pack(p);
! 		p.pack(m_FeatureModel);
! 		p.pack(m_X);
! 		p.pack(m_Y);
! 		p.pack(m_Orientation);
! 		p.pack(m_ValueModifier);
  	}
  
- 	virtual void unpack(simdata::UnPacker& p) {
- 		Object::unpack(p);
- 		p.unpack(m_FeatureModel);
- 		p.unpack(m_X);
- 		p.unpack(m_Y);
- 		p.unpack(m_Orientation);
- 		p.unpack(m_ValueModifier);
- 	}
  };
  
--- 109,121 ----
  	void makeFeatures(std::vector<Feature> &features, int value) const;
  
! 	virtual void serialize(simdata::Archive &archive) {
! 		Object::serialize(archive);
! 		archive(m_FeatureModel);
! 		archive(m_X);
! 		archive(m_Y);
! 		archive(m_Orientation);
! 		archive(m_ValueModifier);
  	}
  
  };
  

Index: FeatureObjectModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureObjectModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FeatureObjectModel.h	26 Jun 2003 09:25:45 -0000	1.1
--- FeatureObjectModel.h	20 Oct 2003 00:23:23 -0000	1.2
***************
*** 84,88 ****
  	virtual void makeFeatures(std::vector<Feature> &features, int value) const;
  
! 	SIMDATA_OBJECT(FeatureObjectModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureObjectModel)
--- 84,88 ----
  	virtual void makeFeatures(std::vector<Feature> &features, int value) const;
  
! 	SIMDATA_STATIC_OBJECT(FeatureObjectModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureObjectModel)
***************
*** 96,112 ****
  	virtual ~FeatureObjectModel();
  
! 	virtual void pack(simdata::Packer& p) const {
! 		Object::pack(p);
! 		p.pack(m_HitPoints);
! 		p.pack(m_Value);
! 		p.pack(m_ObjectModel);
  	}
  
- 	virtual void unpack(simdata::UnPacker& p) {
- 		Object::unpack(p);
- 		p.unpack(m_HitPoints);
- 		p.unpack(m_Value);
- 		p.unpack(m_ObjectModel);
- 	}
  };
  
--- 96,106 ----
  	virtual ~FeatureObjectModel();
  
! 	virtual void serialize(simdata::Archive &archive) {
! 		Object::serialize(archive);
! 		archive(m_HitPoints);
! 		archive(m_Value);
! 		archive(m_ObjectModel);
  	}
  
  };
  

Index: FeatureQuad.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/FeatureQuad.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FeatureQuad.h	26 Jun 2003 09:25:45 -0000	1.1
--- FeatureQuad.h	20 Oct 2003 00:23:23 -0000	1.2
***************
*** 59,63 ****
  
  public:
! 	SIMDATA_OBJECT(FeatureQuad, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureQuad)
--- 59,63 ----
  
  public:
! 	SIMDATA_STATIC_OBJECT(FeatureQuad, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(FeatureQuad)
***************
*** 82,103 ****
  	osg::StateSet * getStateSet() const;
  
! 	virtual void pack(simdata::Packer& p) const {
! 		Object::pack(p);
! 		p.pack(m_Texture);
! 		p.pack(m_Width);
! 		p.pack(m_Height);
! 		p.pack(m_OffsetX);
! 		p.pack(m_OffsetY);
! 		p.pack(m_Lighting);
! 	}
! 
! 	virtual void unpack(simdata::UnPacker& p) {
! 		Object::unpack(p);
! 		p.unpack(m_Texture);
! 		p.unpack(m_Width);
! 		p.unpack(m_Height);
! 		p.unpack(m_OffsetX);
! 		p.unpack(m_OffsetY);
! 		p.unpack(m_Lighting);
  	}
  };
--- 82,93 ----
  	osg::StateSet * getStateSet() const;
  
! 	virtual void serialize(simdata::Archive &archive) {
! 		Object::serialize(archive);
! 		archive(m_Texture);
! 		archive(m_Width);
! 		archive(m_Height);
! 		archive(m_OffsetX);
! 		archive(m_OffsetY);
! 		archive(m_Lighting);
  	}
  };

Index: Objective.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/Objective.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Objective.h	26 Jun 2003 09:25:45 -0000	1.1
--- Objective.h	20 Oct 2003 00:23:23 -0000	1.2
***************
*** 51,61 ****
  	virtual ~Objective();
  
! 	virtual void pack(simdata::Packer& p) const {
! 		FeatureGroup::pack(p);
! 		p.pack(m_StrategicValueModifier);
! 	}
! 	virtual void unpack(simdata::UnPacker& p) {
! 		FeatureGroup::unpack(p);
! 		p.unpack(m_StrategicValueModifier);
  	}
  };
--- 51,57 ----
  	virtual ~Objective();
  
! 	virtual void serialize(simdata::Archive &archive) {
! 		FeatureGroup::serialize(archive);
! 		archive(m_StrategicValueModifier);
  	}
  };

Index: RandomBillboardModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/RandomBillboardModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RandomBillboardModel.h	26 Jun 2003 09:25:45 -0000	1.1
--- RandomBillboardModel.h	20 Oct 2003 00:23:23 -0000	1.2
***************
*** 52,56 ****
  	
  public:
! 	SIMDATA_OBJECT(RandomBillboardModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(RandomBillboardModel)
--- 52,56 ----
  	
  public:
! 	SIMDATA_STATIC_OBJECT(RandomBillboardModel, 0, 0)
  
  	BEGIN_SIMDATA_XML_INTERFACE(RandomBillboardModel)
***************
*** 76,93 ****
  	virtual ~RandomBillboardModel();
  
! 	virtual void pack(simdata::Packer& p) const {
! 		FeatureGroupModel::pack(p);
! 		p.pack(m_Models);
! 		p.pack(m_Density);
! 		p.pack(m_MinimumSpacing);
! 		p.pack(m_Seed);
! 	}
! 
! 	virtual void unpack(simdata::UnPacker& p) {
! 		FeatureGroupModel::unpack(p);
! 		p.unpack(m_Models);
! 		p.unpack(m_Density);
! 		p.unpack(m_MinimumSpacing);
! 		p.unpack(m_Seed);
  	}
  
--- 76,85 ----
  	virtual ~RandomBillboardModel();
  
! 	virtual void serialize(simdata::Archive &archive) {
! 		FeatureGroupModel::serialize(archive);
! 		archive(m_Models);
! 		archive(m_Density);
! 		archive(m_MinimumSpacing);
! 		archive(m_Seed);
  	}
  

Index: RandomForestModel.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Theater/RandomForestModel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RandomForestModel.h	26 Jun 2003 09:25:45 -0000	1.1
--- RandomForestModel.h	20 Oct 2003 00:23:23 -0000	1.2
***************
*** 90,106 ****
  	virtual ~RandomForestModel();
  
! 	virtual void pack(simdata::Packer& p) const {
! 		FeatureGroupModel::pack(p);
! 		p.pack(m_Models);
! 		p.pack(m_Density);
! 		p.pack(m_MinimumSpacing);
! 		p.pack(m_Seed);
! 	}
! 	virtual void unpack(simdata::UnPacker& p) {
! 		FeatureGroupModel::unpack(p);
! 		p.unpack(m_Models);
! 		p.unpack(m_Density);
! 		p.unpack(m_MinimumSpacing);
! 		p.unpack(m_Seed);
  	}
  
--- 90,99 ----
  	virtual ~RandomForestModel();
  
! 	virtual void serialize(simdata::Archive &archive) {
! 		FeatureGroupModel::serialize(archive);
! 		archive(m_Models);
! 		archive(m_Density);
! 		archive(m_MinimumSpacing);
! 		archive(m_Seed);
  	}

[Csp-commits] APPLICATIONS/CSPSim/Include/Theater CustomLayoutModel.h,1.1,1.2 FeatureGroup.h,1.1,1.2

[Csp-commits] APPLICATIONS/CSPSim/Include/Theater CustomLayoutModel.h,1.1,1.2 FeatureGroup.h,1.1,1.2 FeatureGroupList.h,1.1,1.2 FeatureLayout.h,1.2,1.3 FeatureObjectModel.h,1.1,1.2 FeatureQuad.h,1.1,1.2 Objective.h,1.1,1.2 RandomBillboardModel.h,1.1,1.2 RandomForestModel.h,1.1,1.2