csp-commits — Mailing list for CVS commit messages.

[Csp-commits] APPLICATIONS/CSPSim/Include SimpleConfig.h,1.3,1.4

[<de...@us...>]

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

Modified Files:
	SimpleConfig.h 
Log Message:
# if defined(_MSC_VER) && (_MSC_VER <= 1200)
#pragma warning (disable : 4786)
# endif

class HashString {
	public:
     size_t operator()(std::string const &str) const {

Index: SimpleConfig.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/SimpleConfig.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimpleConfig.h	2 Feb 2003 20:53:27 -0000	1.3
--- SimpleConfig.h	3 Feb 2003 19:17:45 -0000	1.4
***************
*** 340,344 ****
  	class HashString {
  	public:
! 		bool operator()(std::string const &str) const {
  			return HASH<char const *>()(str.c_str());
  		}
--- 340,344 ----
  	class HashString {
  	public:
!      size_t operator()(std::string const &str) const {
  			return HASH<char const *>()(str.c_str());
  		}

[Csp-commits] APPLICATIONS/SimData/VisualStudio SimData.dsp,1.1,1.2

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv19147

Modified Files:
	SimData.dsp 
Log Message:
no message

Index: SimData.dsp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio/SimData.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SimData.dsp	2 Feb 2003 15:47:22 -0000	1.1
--- SimData.dsp	3 Feb 2003 19:11:53 -0000	1.2
***************
*** 171,178 ****
  # Begin Source File
  
- SOURCE=..\Source\SimDataEntryPoint.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=..\Source\Spread.cpp
  # End Source File
--- 171,174 ----

[Csp-commits] APPLICATIONS/SimData/Include/SimData Random.h,1.2,1.3

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv18768

Modified Files:
	Random.h 
Log Message:
no message

Index: Random.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Random.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Random.h	28 Jan 2003 23:26:06 -0000	1.2
--- Random.h	3 Feb 2003 19:11:04 -0000	1.3
***************
*** 31,34 ****
--- 31,39 ----
  
  #include <math.h>
+ 
+ #ifdef _WIN32
+ #include <SimData/Export.h>
+ #endif
+ 
  #include <SimData/ns-simdata.h>
  
***************
*** 50,54 ****
   * @author Mark Rose <mr...@st...>
   */
! class Random {
  	long _seed;
  	float _r;
--- 55,59 ----
   * @author Mark Rose <mr...@st...>
   */
! class SIMDATA_EXPORT Random {
  	long _seed;
  	float _r;
***************
*** 89,93 ****
   * Global random number generator.
   */
! extern Random g_Random;
  
  
--- 94,99 ----
   * Global random number generator.
   */
! 
! SIMDATA_EXPORT extern Random g_Random;
  
  

[Csp-commits] APPLICATIONS/SimData/Include/SimData Path.h,1.3,1.4

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv18637

Modified Files:
	Path.h 
Log Message:
no message

Index: Path.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Path.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Path.h	2 Feb 2003 15:36:09 -0000	1.3
--- Path.h	3 Feb 2003 19:10:52 -0000	1.4
***************
*** 36,40 ****
  #include <string>
  
! #if defined(_MSC_VER) && (_MSC_VER <= 1200)
  #include <assert.h>
  #endif
--- 36,40 ----
  #include <string>
  
! #if defined(_MSC_VER) && (_MSC_VER <= 1300)
  #include <assert.h>
  #endif

[Csp-commits] APPLICATIONS/SimData/Include/SimData DataArchive.h,1.4,1.5

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv18536

Modified Files:
	DataArchive.h 
Log Message:
no message

Index: DataArchive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DataArchive.h	2 Feb 2003 15:36:09 -0000	1.4
--- DataArchive.h	3 Feb 2003 19:10:39 -0000	1.5
***************
*** 27,30 ****
--- 27,34 ----
  #define __DATAARCHIVE_H__
  
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning(disable : 4786)
+ # endif
+ 
  #include <string>
  #include <stdio.h>

[Csp-commits] APPLICATIONS/CSPSim/Source DynamicObject.cpp,1.4,1.5

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv6753

Modified Files:
	DynamicObject.cpp 
Log Message:


Index: DynamicObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/DynamicObject.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DynamicObject.cpp	2 Feb 2003 21:37:51 -0000	1.4
--- DynamicObject.cpp	2 Feb 2003 21:40:26 -0000	1.5
***************
*** 27,30 ****
--- 27,32 ----
  #include <osgParticle/ParticleSystemUpdater>
  
+ #include <SimData/Quaternion.h>
+ 
  #include "DynamicObject.h"
  #include "LogStream.h"

[Csp-commits] APPLICATIONS/CSPSim/Source DynamicObject.cpp,1.3,1.4

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv5287

Modified Files:
	DynamicObject.cpp 
Log Message:


Index: DynamicObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/DynamicObject.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DynamicObject.cpp	2 Feb 2003 20:53:28 -0000	1.3
--- DynamicObject.cpp	2 Feb 2003 21:37:51 -0000	1.4
***************
*** 148,152 ****
  	if (m_SmokeSegments) {
  		simdata::Vector3 motion = m_LocalPosition - m_PrevPosition;
! 		simdata::Vector3 motionBody = QVRotate(m_qOrientation.Bar(), motion);
  		m_SmokeSegments->update(osg::Vec3(motionBody.x, motionBody.y, motionBody.z));
  	}
--- 148,152 ----
  	if (m_SmokeSegments) {
  		simdata::Vector3 motion = m_LocalPosition - m_PrevPosition;
! 		simdata::Vector3 motionBody = simdata::QVRotate(m_qOrientation.Bar(), motion);
  		m_SmokeSegments->update(osg::Vec3(motionBody.x, motionBody.y, motionBody.z));
  	}

[Csp-commits] APPLICATIONS/CSPSim/Source CSPSim.PYTHON,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv3624

Added Files:
	CSPSim.PYTHON 
Log Message:


--- NEW FILE: CSPSim.PYTHON ---
#!/usr/bin/python

import sys

# enable lazy loading of shared library modules
sys.setdlopenflags(0x101)

import SimData
import CSP

config = "../Data/CSPSim.ini"

if not CSP.openConfig(config):
	print "Unable to open primary configuration file (%s)" % config
	sys.exit(0)
	
app = CSP.CSPSim()

app.Init()
app.Run()
app.Cleanup()
app.Exit()

print "CSPSim normal exit."

[Csp-commits] APPLICATIONS/CSPSim/Source SmokeEffects.cpp,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv24767

Added Files:
	SmokeEffects.cpp 
Log Message:


--- NEW FILE: SmokeEffects.cpp ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2002 The Combat Simulator Project
// http://csp.sourceforge.net
// 
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// 
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
// 
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.


/**
 * @file SmokeEffects.cpp
 *
 **/


/*
 * need to clean up the BaseSystem interface, and allow multiple operators
 *
 * need to provide access to the particle system after creation to allow
 * continuous variations (color, thickness, rate, velocity, lifetime, etc).
 *
 * need classes to drive the basic particle systems through scripted routine
 * such as explosion -> fire -> smoke -> smolder.
 *
 * explosion class, flare class, chaff class, etc.
 * white smoke, fire, black smoke, dust, water plume, splash, wingtip votices,
 * strake vortices, exhaust (w/thickness curve tied to throttle), contrails
 *
 * can we use a global particle system for all FX?  probably not a good idea
 * since it would be best to disable particle systems that are far from the
 * camera.
 *
 *
 * flare class: ***** several overlapping, emitting particles + halo? 
 * can probably implement as a subclass of particle.
 *
 */

#include "SmokeEffects.h"

#include <osg/Transform>
#include <osgParticle/LinearInterpolator>
#include <osgParticle/ParticleSystem>
#include <osgParticle/ParticleSystemUpdater>
#include <osgParticle/ModularEmitter>
#include <osgParticle/ModularProgram>
#include <osgParticle/RandomRateCounter>
#include <osgParticle/SectorPlacer>
#include <osgParticle/SegmentPlacer>
#include <osgParticle/RadialShooter>

#include <cstdio>
#include <SimData/Random.h>

namespace effects {
namespace smoke {

int SmokeSegments::addSource(osg::Vec3 const &v) {
	if (!m_Sources) {
		m_Sources = osgNew osg::Vec3Array;
	}
	m_Sources->push_back(v);
	m_Placers.push_back(osgNew osgParticle::SegmentPlacer);
	return m_Sources->size()-1;
}

osgParticle::SegmentPlacer *SmokeSegments::getSegment(int i) { return m_Placers[i].get(); }

void SmokeSegments::update(osg::Vec3 const &motion) {
	PlacerArray::iterator i;
	osg::Vec3Array::iterator j = m_Sources->begin();
	for (i = m_Placers.begin(); i != m_Placers.end(); i++, j++) {
		(*i)->setVertexA(*j);
		(*i)->setVertexB(*j - motion);
	}
}

void VortexExpander::operate(osgParticle::Particle *p, double dt)
{
	static int x = 0;
	if (p && isEnabled()) {
		float age = p->getAge();
		if (age > 1.0 && age < 2.0) {
			float dt = age-1.0;
			float r = 0.25+dt*dt;
			p->setSizeRange(osgParticle::rangef(0.0, r * 5.0 / age));
		} else
		if (age > 2.0) {
			float dt = age-2.0;
			float r = 1.25 + sqrt(dt);
			p->setSizeRange(osgParticle::rangef(0.0, r * 5.0 / age));
		}
		x++;
		if (age > 1.0 && (x % 300)==0) p->setLifeTime(age);
	}
}


BaseSystem::BaseSystem() {
	setDefault();
}

BaseSystem::~BaseSystem() {}

void BaseSystem::setDefault() {
	m_Prototype.setShape(osgParticle::Particle::QUAD);
	m_Prototype.setLifeTime(1.0);
	m_Prototype.setAlphaRange(osgParticle::rangef(1,0));
	m_Prototype.setSizeRange(osgParticle::rangef(0.2, 0.2));
	m_Prototype.setPosition(osg::Vec3(0,0,0));
	m_Prototype.setVelocity(osg::Vec3(0,0,0));
	m_Prototype.setColorRange(osgParticle::rangev4(osg::Vec4(1,1,1,1), osg::Vec4(1,1,1,1)));
	m_Prototype.setRadius(10000.0);
	m_Emissive = false;
	m_Light = false;
}

void BaseSystem::setTexture(const string & TextureFile) { m_TextureFile = TextureFile; }

void BaseSystem::setColorRange(const osg::Vec4 &colorMin, const osg::Vec4 &colorMax) {
	m_Prototype.setColorRange(osgParticle::rangev4(colorMin, colorMax));
}

void BaseSystem::setAlphaRange(float alpha_0, float alpha_1) {
	m_Prototype.setAlphaRange(osgParticle::rangef(alpha_0, alpha_1));
}

void BaseSystem::setSizeRange(float size_0, float size_1) {
	m_Prototype.setSizeRange(osgParticle::rangef(size_0, size_1));
}

void BaseSystem::setLifeTime(float t) {
	m_Prototype.setLifeTime(t);
}

void BaseSystem::setShape(osgParticle::Particle::Shape const &shape) {
	m_Prototype.setShape(shape);
}

void BaseSystem::setEmissive(bool emissive) { m_Emissive = emissive; }
void BaseSystem::setLight(bool light) { m_Light = light; }

void BaseSystem::setCounter(osgParticle::Counter *counter) {
	m_UserCounter = counter;
}

osgParticle::Counter *BaseSystem::getCounter() {
	if (!m_UserCounter) return NULL;
	return m_UserCounter.get();
}

void BaseSystem::setShooter(osgParticle::Shooter *shooter) {
	m_UserShooter = shooter;
}

osgParticle::Shooter *BaseSystem::getShooter() {
	if (!m_UserShooter) return NULL;
	return m_UserShooter.get();
}

void BaseSystem::setPlacer(osgParticle::Placer *placer) {
	m_UserPlacer = placer;
}

osgParticle::Placer *BaseSystem::getPlacer() {
	if (!m_UserPlacer) return NULL;
	return m_UserPlacer.get();
}

void BaseSystem::setOperator(osgParticle::Operator *op) {
	m_UserOperator = op;
}

osgParticle::Operator *BaseSystem::getOperator() { 
	if (!m_UserOperator) return NULL;
	return m_UserOperator.get();
}

osgParticle::ParticleSystem *BaseSystem::create(osg::Transform *base, 
					    osgParticle::ParticleSystemUpdater *&psu) {
	osgParticle::ParticleSystem *ps = osgNew osgParticle::ParticleSystem;
	ps->setDefaultAttributes(m_TextureFile, m_Emissive, m_Light, 0);
	ps->setDefaultParticleTemplate(m_Prototype);
	ps->setFreezeOnCull(false);
	osgParticle::ModularEmitter *me = osgNew osgParticle::ModularEmitter;
	me->setParticleSystem(ps);
	m_Placer = getPlacer();
	assert(m_Placer.valid());
	me->setPlacer(m_Placer.get());
	m_Counter = getCounter();
	assert(m_Counter.valid());
	me->setCounter(m_Counter.get());
	m_Shooter = getShooter();
	assert(m_Shooter.valid());
	me->setShooter(m_Shooter.get());
	base->addChild(me);
	osgParticle::ModularProgram *mp = osgNew osgParticle::ModularProgram;
	mp->setParticleSystem(ps);
	// need a better setup to allow multiple operators
	m_Operator = getOperator();
	if (m_Operator.valid()) {
		mp->addOperator(m_Operator.get());
	}
	base->addChild(mp);
	if (!psu) {
		psu = osgNew osgParticle::ParticleSystemUpdater;
	}
	psu->addParticleSystem(ps);
	return ps;
}

void Thinner::operate(osgParticle::Particle *p, double dt)
{
	float lifetime = p->getRadius();
	// check if we've already operated on this particle
	if (lifetime > 1000.0) {
		float x = simdata::g_Random.NewRand();
		float old_lifetime = p->getLifeTime();
		// this needs to be made into a member variable, set by
		// a constructor argument
		int max = 10;
		x *= x;
		x *= x;
		// adjust the lifetime, weighted toward small t
		lifetime = x * x * (max-0.5) + 0.5;
		p->setLifeTime(lifetime);
		// mark this particle as "thinned"
		p->setRadius(1.0);
		// rescale the size range to match the new lifetime
		float scale = 1.0;
		if (old_lifetime > 0.0) scale = lifetime / old_lifetime;
		osgParticle::rangef const &r = p->getSizeRange();
		p->setSizeRange(osgParticle::rangef(r.minimum, r.maximum * scale));
	} 
}

osgParticle::Shooter *Trail::getShooter() {
	osgParticle::Shooter *user = BaseSystem::getShooter();
	if (user) return user;
	osgParticle::RadialShooter *rs = osgNew osgParticle::RadialShooter;
	rs->setPhiRange(-0.21, 1.78);
	rs->setThetaRange(0.0, 1.57);
	rs->setInitialSpeedRange(0, m_Speed);
	return rs;
}

osgParticle::Counter *Trail::getCounter() {
	osgParticle::Counter *user = BaseSystem::getCounter();
	if (user) return user;
	osgParticle::RandomRateCounter *rrc = osgNew osgParticle::RandomRateCounter;
	// this should be adjustable, even if these are the defaults
	rrc->setRateRange(2000, 2400);
	return rrc;
}

void Trail::setExpansion(float speed) {
	m_Speed = speed;
}


} // smoke
} // effects

[Csp-commits] APPLICATIONS/CSPSim/Source LogStream.cpp,NONE,1.1 logstream.cpp,1.2,NONE

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv22410/Source

Added Files:
	LogStream.cpp 
Removed Files:
	logstream.cpp 
Log Message:
logstream renamed to LogStream

--- NEW FILE: LogStream.cpp ---


// This file orginated from FlightGear, Modififed by Wolverine


// Stream based logging mechanism.
//
// Written by Bernie Bright, 1998
//
// Copyright (C) 1998  Bernie Bright - bb...@c0...
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
// Library General Public License for more details.
//
// You should have received a copy of the GNU Library General Public
// License along with this library; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA  02111-1307, USA.
//
// $Id: LogStream.cpp,v 1.1 2003/02/02 21:13:40 mkrose Exp $

#include "stdinc.h"

bool            logbuf::logging_enabled = true;
cspDebugClass    logbuf::logClass        = CSP_NONE;
cspDebugPriority logbuf::logPriority     = CSP_INFO;
streambuf*      logbuf::sbuf            = NULL;

logbuf::logbuf()
{
//     if ( sbuf == NULL )
// 	sbuf = cerr.rdbuf();
}

logbuf::~logbuf()
{
    if ( sbuf )
	    sync();
}

void
logbuf::set_sb( streambuf* sb )
{
    if ( sbuf )
	    sync();

    sbuf = sb;
}

void
logbuf::set_log_level( cspDebugClass c, cspDebugPriority p )
{
    logClass = c;
    logPriority = p;
}

void
logbuf::set_log_classes (cspDebugClass c)
{
    logClass = c;
}

cspDebugClass
logbuf::get_log_classes ()
{
    return logClass;
}

void
logbuf::set_log_priority (cspDebugPriority p)
{
    logPriority = p;
}

cspDebugPriority
logbuf::get_log_priority ()
{
    return logPriority;
}

void
logstream::setLogLevels( cspDebugClass c, cspDebugPriority p )
{
    logbuf::set_log_level( c, p );
}


--- logstream.cpp DELETED ---

[Csp-commits] APPLICATIONS/CSPSim/Include SmokeEffects.h,NONE,1.1

[<mk...@us...>]

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

Added Files:
	SmokeEffects.h 
Log Message:


--- NEW FILE: SmokeEffects.h ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2002 The Combat Simulator Project
// http://csp.sourceforge.net
// 
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// 
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
// 
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.


/**
 * @file SmokeEffects.h
 *
 **/


#ifndef __SMOKEEFFECTS_H__
#define __SMOKEEFFECTS_H__

#include <osg/ref_ptr>
#include <osgParticle/Operator>
#include <osgParticle/SegmentPlacer>

#include <vector>
#include <string>

namespace osgParticle {
	class ParticleSystem;
	class ParticleSystemUpdater;
	class Placer;
	class Counter;
	class Shooter;
}

namespace effects {
namespace smoke {


class SmokeSegments {
	typedef std::vector<osg::ref_ptr<osgParticle::SegmentPlacer> > PlacerArray;
	PlacerArray m_Placers;
	osg::ref_ptr<osg::Vec3Array> m_Sources;
public:
	SmokeSegments() {
	}
	~SmokeSegments() {
	}
	int addSource(osg::Vec3 const &v);
	osgParticle::SegmentPlacer *getSegment(int i);
	void update(osg::Vec3 const &motion);
};

class VortexExpander: public osgParticle::Operator
{
public:
	META_Object(csp, VortexExpander);
	VortexExpander() {}
	VortexExpander(const VortexExpander &copy, const osg::CopyOp &copyop): Operator(copy, copyop) {}
	virtual void operate(osgParticle::Particle *p, double dt);
};


class BaseSystem
{
public:
	BaseSystem();
	virtual ~BaseSystem();
	void setDefault();
	void setTexture(const string & TextureFile);
	void setColorRange(const osg::Vec4 &colorMin, const osg::Vec4 &colorMax);
	void setAlphaRange(float alpha_0, float alpha_1);
	void setSizeRange(float size_0, float size_1);
	void setLifeTime(float t);
	void setShape(osgParticle::Particle::Shape const &shape);
	void setEmissive(bool emissive);
	void setLight(bool light);
	virtual void setCounter(osgParticle::Counter *counter);
	virtual osgParticle::Counter *getCounter();
	virtual void setShooter(osgParticle::Shooter *shooter);
	virtual osgParticle::Shooter *getShooter();
	virtual void setPlacer(osgParticle::Placer *placer);
	virtual osgParticle::Placer *getPlacer();
	virtual void setOperator(osgParticle::Operator *op);
	virtual osgParticle::Operator *getOperator();
	virtual osgParticle::ParticleSystem *create(osg::Transform *base, 
	                                            osgParticle::ParticleSystemUpdater *&psu);
						    
protected:
	osgParticle::Particle m_Prototype;
	bool m_Emissive;
	bool m_Light;
	std::string m_TextureFile;
	osg::ref_ptr<osgParticle::Operator> m_Operator;
	osg::ref_ptr<osgParticle::Operator> m_UserOperator;
	osg::ref_ptr<osgParticle::Placer> m_Placer;
	osg::ref_ptr<osgParticle::Placer> m_UserPlacer;
	osg::ref_ptr<osgParticle::Counter> m_Counter;
	osg::ref_ptr<osgParticle::Counter> m_UserCounter;
	osg::ref_ptr<osgParticle::Shooter> m_Shooter;
	osg::ref_ptr<osgParticle::Shooter> m_UserShooter;
};


class Thinner: public osgParticle::Operator
{
public:
	META_Object(csp, Thinner);
	Thinner() {}
	Thinner(const Thinner &copy, const osg::CopyOp &copyop): Operator(copy, copyop) {}
	virtual void operate(osgParticle::Particle *p, double dt);
	int m_X;
};

class Trail: public BaseSystem
{
public:
	Trail(): BaseSystem() { m_Segment = NULL; m_Speed = 0.0; }
	virtual osgParticle::Shooter *getShooter();
	virtual osgParticle::Counter *getCounter();
	void setExpansion(float speed);
protected:
	osgParticle::SegmentPlacer *m_Segment;
	float m_Speed;
};


} // smoke
} // effects


#endif // __SMOKEEFFECTS_H__

[Csp-commits] APPLICATIONS/CSPSim Makefile.in,NONE,1.1

[<mk...@us...>]

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

Added Files:
	Makefile.in 
Log Message:
makefile.in without automake

--- NEW FILE: Makefile.in ---
SUBDIRS = Source 

export DEMETER_RELATIVE = ../../THIRDPARTYLIBS/demeter
export SIMDATA_RELATIVE = ../SimData

export GDEBUGF = -g -Wall
export GCFLAGS = -I/usr/local/include/python2.2 -I/usr/local/include -fPIC -DSWIG_GLOBAL # -O2
export GLDOPTS = -shared -lswigpy -ldl
export GSWOPTS = -c -c++ -python -noexcept
export CXX = g++
export SWIG = swig 

.PHONY: all clean clean-deps swig default

default: all

all clean clean-deps: Makefile
	@for dir in $(SUBDIRS); do \
		$(MAKE) -C $${dir} $@ || exit 1; \
	done

#default: 
#	@for dir in $(SUBDIRS); do \
#		$(MAKE) -C $${dir} $@ || exit 1; \
#	done

swig:
	rm Source/cSimData_wrap.cpp || true;
	make -C Source all

Makefile: Makefile.in configure.in aclocal.m4
	./configure

[Csp-commits] APPLICATIONS/CSPSim/Source Makefile.in,NONE,1.1

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv19269/Source

Added Files:
	Makefile.in 
Log Message:
makefile.in without automake

--- NEW FILE: Makefile.in ---
TOPDIR = ..

DEMETER_PREFIX = $(TOPDIR)/$(DEMETER_RELATIVE)
DEMETER_INCLUDE = -I$(DEMETER_PREFIX)
DEMETER_LIBRARY = -L$(DEMETER_PREFIX) -ldemeter_csp #libdemeter_csp.so #$(DEMETER_PREFIX)/libdemeter_csp.so

SIMDATA_PREFIX = $(TOPDIR)/$(SIMDATA_RELATIVE)
SIMDATA_INCLUDE = -I$(SIMDATA_PREFIX)/Include
SIMDATA_LIBRARY = #_cSimData.so #$(SIMDATA_PREFIX)/Source/_cSimData.so

LIBS = $(SIMDATA_LIBRARY) $(DEMETER_LIBRARY)

INCLUDE = -I$(TOPDIR)/Include $(DEMETER_INCLUDE) $(SIMDATA_INCLUDE)

CFLAGS = $(GCFLAGS) $(INCLUDE) $(GDEBUGF)  @SDL_FLAGS@ @GDAL_FLAGS@
SWCXXF = $(GCFLAGS) $(INCLUDE)
LDOPTS = -Wl,-z,lazyload $(GLDOPTS) @LIBS@
SWOPTS = $(GSWOPTS) $(INCLUDE)

SOURCES = \
	AeroDynamics.cpp \
	AircraftObject.cpp \
	base.cpp \
	BaseScreen.cpp \
	Config.cpp \
	ConsoleCommands.cpp \
	CSPSim.cpp \
	DynamicObject.cpp \
	EventMapIndex.cpp \
	EventMapping.cpp \
	F16Model.cpp \
	GameScreen.cpp \
	HID.cpp \
	InputInterface.cpp \
	LogoScreen.cpp \
	LogStream.cpp \
	MenuScreen.cpp \
 	Message.cpp \
	mmgr.cpp \
	ObjectModel.cpp \
	ObjectRangeInfo.cpp \
	Platform.cpp \
	SimObject.cpp \
	SimpleConfig.cpp \
	sky.cpp \
	SmokeEffects.cpp \
	StaticObject.cpp \
	TankObject.cpp \
	TerrainObject.cpp \
	Tools.cpp \
	trees.cpp \
	VirtualBattlefield.cpp 

OBJECTS = $(SOURCES:%.cpp=%.o) 

DEPDIR = .deps
MKDEP = $(CXX) -M $(CFLAGS)
SWDEP = $(SWIG) -M $(SWOPTS)
DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cSimData.i.swigdep
DEPFILTER =
DEPS_MAGIC := $(shell mkdir $(DEPDIR) > /dev/null 2>&1 || :)

.PHONY: clean-deps clean all default

default:
	@echo "run make from top-level directory only"
	
clean-objects:
	rm -f $(SOURCES:%.cpp=%.o)
	rm -f lib*.a
	rm -f _CSP.so CSP_wrap.*
	rm -f $(DEPDIR)/*.d

clean-dependencies:
	@echo $(RM) -r $(RMFLAGS) $(DEPDIR)

clean-deps: clean-dependencies

clean: clean-deps clean-objects

ifeq ($(findstring clean,$(MAKECMDGOALS)),)
ifneq ($(strip $(DEPFILES)),)
-include $(DEPFILES)
endif
endif

#clean clean-deps:
#	for dir in $(SUBDIRS); do \
#		$(MAKE) -C $${dir} $@; \
#	done
	
build-subdirs:
	@for dir in $(SUBDIRS); do \
		$(MAKE) -C $${dir} all; \
	done

$(DEPDIR)/%.d : %
	@echo "Computing dependencies for $<..."
	@$(MKDEP) $< $(DEPFILTER) > $@
	
$(DEPDIR)/%.swigdep : %
	@echo "Computing dependencies for $<..."
	@$(SWDEP) $(DEPFILTER) -o $(<:.i=_wrap.cpp) $< > $@

_CSP.so: $(OBJECTS) CSP_wrap.o
	$(CXX) $(LDOPTS) -o$@ $^ $(LIBS)
	
CSPapp: $(OBJECTS) main.o
	$(CXX) -lswigpy -lpython2.2 -o$@ $^ $(LIBS)

CSP_wrap.cpp: CSP.i
	$(SWIG) $(SWOPTS) -o $@ $< 

CSP_wrap.o: CSP_wrap.cpp
	$(CXX) -c $(SWCXXF) $(@:.o=.cpp)

%.o: %.cpp 
	$(CXX) -c $(CFLAGS) $(@:.o=.cpp)

Makefile: Makefile.in
	cd $(TOPDIR) && ./configure

all: Makefile _CSP.so #CSPapp
#all: build-subdirs _CSP.so 

[Csp-commits] APPLICATIONS/CSPSim configure.in,1.2,1.3

[<mk...@us...>]

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

Modified Files:
	configure.in 
Log Message:
automake macros commented out of configure.in

Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.in	26 Jan 2003 23:30:59 -0000	1.2
--- configure.in	2 Feb 2003 21:06:42 -0000	1.3
***************
*** 10,15 ****
  dnl Process this file with autoconf to produce a configure script.
  AC_INIT(Source/CSPSim.cpp)
! AM_INIT_AUTOMAKE(CSPSim, 0.1.0)
! AM_CONFIG_HEADER(config.h)
  
  dnl Checks for programs.
--- 10,15 ----
  dnl Process this file with autoconf to produce a configure script.
  AC_INIT(Source/CSPSim.cpp)
! #AM_INIT_AUTOMAKE(CSPSim, 0.1.0)
! #AM_CONFIG_HEADER(config.h)
  
  dnl Checks for programs.

[Csp-commits] APPLICATIONS/CSPSim/Include CSPSim.i,NONE,1.1 Config.i,NONE,1.1 SimpleConfig.i,NONE,1.1

[<mk...@us...>]

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

Added Files:
	CSPSim.i Config.i SimpleConfig.i 
Log Message:


--- NEW FILE: CSPSim.i ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2002 The Combat Simulator Project
// http://csp.sourceforge.net
// 
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// 
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
// 
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.


%module CSPSim
%{
#include "CSPSim.h"
%}

%include "CSPSim.h"


--- NEW FILE: Config.i ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2002 The Combat Simulator Project
// http://csp.sourceforge.net
// 
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// 
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
// 
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.


%module Config
%{
#include "Config.h"
%}

%include "Config.h"



--- NEW FILE: SimpleConfig.i ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2002 The Combat Simulator Project
// http://csp.sourceforge.net
// 
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
// 
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
// 
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.


%module SimpleConfig
%{
#include "SimpleConfig.h"
%}

%include "SimpleConfig.h"

[Csp-commits] THIRDPARTYLIBS/demeter Makefile.in,1.2,1.3 Terrain.cpp,1.1.1.1,1.2 Terrain.h,1.1.1.1,1.2 TerrainTextureFactory.h,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv15029

Modified Files:
	Makefile.in Terrain.cpp Terrain.h TerrainTextureFactory.h 
Log Message:
changed lib names, fix for EPSILON and INFINITY redefinition conflicts

Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in	9 Dec 2002 01:33:51 -0000	1.2
--- Makefile.in	2 Feb 2003 20:59:22 -0000	1.3
***************
*** 33,38 ****
  # nothing should be edited below this line
  
! CODE_BINARY=demeter_csp.a
! SHARED_LIB=libdemeter_csp.so
  
  CXXFLAGS+=-Wall 
--- 33,38 ----
  # nothing should be edited below this line
  
! CODE_BINARY=libdemeter_csp.a
! SHARED_LIB=demeter_csp.so
  
  CXXFLAGS+=-Wall 

Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Terrain.cpp	5 Dec 2002 03:33:45 -0000	1.1.1.1
--- Terrain.cpp	2 Feb 2003 20:59:22 -0000	1.2
***************
*** 2219,2223 ****
  {
      Ray ray;
!     float distance = INFINITY;
      Vector point;
      point.x = point.y = point.z = -1.0f;
--- 2219,2223 ----
  {
      Ray ray;
!     float distance = DEMETER_INFINITY;
      Vector point;
      point.x = point.y = point.z = -1.0f;
***************
*** 2375,2380 ****
      float       tnear,tfar,t1,t2;
  
!     tnear = -INFINITY;
!     tfar = INFINITY;
  
  // Find intersection with x-aligned planes of box.
--- 2375,2380 ----
      float       tnear,tfar,t1,t2;
  
!     tnear = -DEMETER_INFINITY;
!     tfar = DEMETER_INFINITY;
  
  // Find intersection with x-aligned planes of box.

Index: Terrain.h
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Terrain.h	5 Dec 2002 03:33:46 -0000	1.1.1.1
--- Terrain.h	2 Feb 2003 20:59:23 -0000	1.2
***************
*** 84,89 ****
  
  #define MAX_VERTICES_PER_FAN 10
! #define EPSILON 0.00001f
! #define INFINITY 999999999.0f
  
  
--- 84,89 ----
  
  #define MAX_VERTICES_PER_FAN 10
! #define DEMETER_EPSILON 0.00001f
! #define DEMETER_INFINITY 999999999.0f
  
  
***************
*** 135,139 ****
                              ~Vector() {}
          float               GetLength();
!         float               Normalize( float tolerance = EPSILON );
  		void				RotateZ(float theta);
          Vector&             operator = ( const Vector& vector );
--- 135,139 ----
                              ~Vector() {}
          float               GetLength();
!         float               Normalize( float tolerance = DEMETER_EPSILON );
  		void				RotateZ(float theta);
          Vector&             operator = ( const Vector& vector );

Index: TerrainTextureFactory.h
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/TerrainTextureFactory.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TerrainTextureFactory.h	7 Dec 2002 07:40:05 -0000	1.2
--- TerrainTextureFactory.h	2 Feb 2003 20:59:23 -0000	1.3
***************
*** 30,34 ****
  
  	TerrainTextureFactory();
! 	~TerrainTextureFactory();
  
  	virtual Texture* GetTexture(int index,float originX,float originY,float width,float height);
--- 30,34 ----
  
  	TerrainTextureFactory();
! 	virtual ~TerrainTextureFactory();
  
  	virtual Texture* GetTexture(int index,float originX,float originY,float width,float height);

[Csp-commits] APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k model.xml,1.1,1.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k
In directory sc8-pr-cvs1:/tmp/cvs-serv11345/Data/XML/vehicles/aircraft/m2k

Modified Files:
	model.xml 
Log Message:
merged deltas win32 fixes, changed SDL header path, moved smoke code to effects classes

Index: model.xml
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k/model.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** model.xml	26 Jan 2003 23:15:55 -0000	1.1
--- model.xml	2 Feb 2003 20:53:27 -0000	1.2
***************
*** 2,6 ****
  
  <Object class="ObjectModel" static="1">
! 	<External name="model_path">Models/m2k2g.3ds</External>
  	<Vector name="axis_0">1 0 0</Vector>
  	<Vector name="axis_1">0 1 0</Vector>
--- 2,8 ----
  
  <Object class="ObjectModel" static="1">
! 	<!--External name="model_path">Models/f35.3DS</External-->
! 	<External name="model_path">Models/f35.3DS</External>
! 	<!--External name="model_path">Models/m2k2g.3ds</External-->
  	<Vector name="axis_0">1 0 0</Vector>
  	<Vector name="axis_1">0 1 0</Vector>

[Csp-commits] APPLICATIONS/CSPSim Makefile.am,1.2,NONE

[<mk...@us...>]

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

Removed Files:
	Makefile.am 
Log Message:
merged deltas win32 fixes, changed SDL header path, moved smoke code to effects classes

--- Makefile.am DELETED ---

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli CSPSimAppli.dsp,NONE,1.1.2.1

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli
In directory sc8-pr-cvs1:/tmp/cvs-serv32032

Added Files:
      Tag: simdata
	CSPSimAppli.dsp 
Log Message:
no message

--- NEW FILE: CSPSimAppli.dsp ---
# Microsoft Developer Studio Project File - Name="CSPSimAppli" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Application" 0x0101

CFG=CSPSimAppli - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "CSPSimAppli.mak".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "CSPSimAppli.mak" CFG="CSPSimAppli - Win32 Debug"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "CSPSimAppli - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "CSPSimAppli - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "CSPSimAppli - Win32 Release"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../../Include" /I "../../../SimData/Include" /I "../../../../THIRDPARTYLIBS/include" /I "../../../../THIRDPARTYLIBS/Demeter" /I "C:/Python22/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40c /d "NDEBUG"
# ADD RSC /l 0x40c /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 DemeterVisualC6.lib opengl32.lib SDLmain.lib SDL.lib SDL_Console.lib gdal_i.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /pdb:"../../Bin/CSPSim.pdb" /debug /machine:I386 /out:"../../Bin/CSPSim.exe" /libpath:"C:/Python22/libs" /libpath:"../../../../THIRDPARTYLIBS/lib"
# SUBTRACT LINK32 /pdb:none

!ELSEIF  "$(CFG)" == "CSPSimAppli - Win32 Debug"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../Include" /I "../../../SimData/Include" /I "../../../../THIRDPARTYLIBS/include" /I "../../../../THIRDPARTYLIBS/Demeter" /I "C:/Python22/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_STLP_USE_OWN_NAMESPACE" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40c /d "_DEBUG"
# ADD RSC /l 0x40c /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 DemeterVisualC6d.lib opengl32.lib SDLmain.lib SDLd.lib SDL_Console.lib gdal_i.lib _cSimDatad.lib osgParticled.lib osgUtild.lib osgDBd.lib osgd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:no /pdb:"../../Bin/CSPSimd.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../Bin/CSPSimd.exe" /pdbtype:sept /libpath:"C:/Python22/libs" /libpath:"../../../../THIRDPARTYLIBS/lib"
# SUBTRACT LINK32 /pdb:none /map

!ENDIF 

# Begin Target

# Name "CSPSimAppli - Win32 Release"
# Name "CSPSimAppli - Win32 Debug"
# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File

SOURCE=..\..\Source\AeroDynamics.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\AircraftModel.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File

SOURCE=..\..\Source\AircraftObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\base.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\BaseScreen.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\Colorspace.cpp
# PROP Exclude_From_Build 1
# End Source File
# Begin Source File

SOURCE=..\..\Source\Config.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\ConsoleCommands.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\CSP_wrap.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\CSPSim.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\DynamicObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\EventMapIndex.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\EventMapping.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\F16Model.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\GameScreen.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\HID.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\InputInterface.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\LogoScreen.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\logstream.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\main.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\MenuScreen.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\Message.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\ObjectModel.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\ObjectRangeInfo.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\Platform.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\SimObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\SimpleConfig.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\sky.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\StaticObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\TankObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\TerrainObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\Tools.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\trees.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\VirtualBattlefield.cpp
# End Source File
# End Group
# Begin Group "Header Files"

# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File

SOURCE=..\..\Include\AeroDynamics.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\AircraftObject.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\BaseController.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\BasePhysics.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\BaseScreen.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\Colorspace.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\compiler.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\CON_consolecommands.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\Config.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\ConsoleCommands.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\CSPSim.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\debug_types.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\DirVectorDrawable.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\DynamicObject.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\EventMapIndex.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\EventMapping.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\FLCS.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\GameScreen.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\GlibCsp.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\HID.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\InputInterface.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\LogoScreen.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\LogStream.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\MenuScreen.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\Message.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\mmgr.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\nommgr.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\ObjectModel.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\ObjectRangeInfo.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\OGLText.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\Platform.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\SimObject.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\SimpleConfig.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\StaticObject.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\stdinc.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\TankObject.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\TerrainObject.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\TerrainSymbol.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\Tools.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\VehicleModel.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\VirtualBattlefield.h
# End Source File
# Begin Source File

SOURCE=..\..\Include\VirtualBattlefieldScene.h
# End Source File
# End Group
# Begin Group "Resource Files"

# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# Begin Source File

SOURCE=..\..\Source\CSP.i

!IF  "$(CFG)" == "CSPSimAppli - Win32 Release"

# Begin Custom Build
InputPath=..\..\Source\CSP.i
InputName=CSP

"..\..\Source\$(InputName)_wrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\..\Source\$(InputName)_wrap.cpp $(InputPath)

# End Custom Build

!ELSEIF  "$(CFG)" == "CSPSimAppli - Win32 Debug"

# Begin Custom Build
InputPath=..\..\Source\CSP.i
InputName=CSP

"..\..\Source\$(InputName)_wrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\..\Source\$(InputName)_wrap.cpp $(InputPath)

# End Custom Build

!ENDIF 

# End Source File
# End Target
# End Project

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli - New directory

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli
In directory sc8-pr-cvs1:/tmp/cvs-serv31854/CSPSimAppli

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimAppli added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL CSPSimDLL.dsp,NONE,1.1.2.1

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL
In directory sc8-pr-cvs1:/tmp/cvs-serv31753

Added Files:
      Tag: simdata
	CSPSimDLL.dsp 
Log Message:
no message

--- NEW FILE: CSPSimDLL.dsp ---
# Microsoft Developer Studio Project File - Name="CSPSimDLL" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

CFG=CSPSimDLL - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "CSPSimDLL.mak".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "CSPSimDLL.mak" CFG="CSPSimDLL - Win32 Debug"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "CSPSimDLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "CSPSimDLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "CSPSimDLL - Win32 Release"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../Include" /I "../../../SimData/Include" /I "../../../../THIRDPARTYLIBS/include" /I "../../../../THIRDPARTYLIBS/Demeter" /I "C:/Python22/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /D "_STLP_USE_OWN_NAMESPACE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40c /d "NDEBUG"
# ADD RSC /l 0x40c /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 DemeterVisualC6.lib opengl32.lib SDLmain.lib SDL.lib SDL_Console.lib gdal_i.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:"../../Bin/CSP.pdb" /debug /machine:I386 /out:"../../Bin/_CSP.dll" /pdbtype:sept /libpath:"../../../../THIRDPARTYLIBS/lib" /libpath:"C:/Python22/libs"
# SUBTRACT LINK32 /pdb:none

!ELSEIF  "$(CFG)" == "CSPSimDLL - Win32 Debug"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSPSIMDLL_EXPORTS" /D "_STLP_USE_OWN_NAMESPACE" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40c /d "_DEBUG"
# ADD RSC /l 0x40c /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /pdbtype:sept

!ENDIF 

# Begin Target

# Name "CSPSimDLL - Win32 Release"
# Name "CSPSimDLL - Win32 Debug"
# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File

SOURCE=..\..\Source\AeroDynamics.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\AircraftModel.cpp

!IF  "$(CFG)" == "CSPSimDLL - Win32 Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "CSPSimDLL - Win32 Debug"

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\Source\AircraftObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\base.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\BaseScreen.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\Colorspace.cpp

!IF  "$(CFG)" == "CSPSimDLL - Win32 Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "CSPSimDLL - Win32 Debug"

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\Source\Config.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\ConsoleCommands.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\CSP_wrap.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\CSPSim.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\DynamicObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\EventMapIndex.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\EventMapping.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\F16Model.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\GameScreen.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\HID.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\InputInterface.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\LogoScreen.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\logstream.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\MenuScreen.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\Message.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\ObjectModel.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\ObjectRangeInfo.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\Platform.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\SimObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\SimpleConfig.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\sky.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\StaticObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\TankObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\TerrainObject.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\Tools.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\trees.cpp
# End Source File
# Begin Source File

SOURCE=..\..\Source\VirtualBattlefield.cpp
# End Source File
# End Group
# Begin Group "Header Files"

# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"

# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# Begin Source File

SOURCE=..\..\Source\CSP.i

!IF  "$(CFG)" == "CSPSimDLL - Win32 Release"

# Begin Custom Build
InputPath=..\..\Source\CSP.i
InputName=CSP

"..\..\Source\$(InputName)_wrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\..\Source\$(InputName)_wrap.cpp $(InputPath)

# End Custom Build

!ELSEIF  "$(CFG)" == "CSPSimDLL - Win32 Debug"

# Begin Custom Build
InputPath=..\..\Source\CSP.i
InputName=CSP

"..\..\Source\$(InputName)_wrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
	C:\progra~1\SWIG-1.3.17\swig -c++ -python -noexcept -DWIN32 -I..\Include -o ..\..\Source\$(InputName)_wrap.cpp $(InputPath)

# End Custom Build

!ENDIF 

# End Source File
# End Target
# End Project

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL - New directory

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL
In directory sc8-pr-cvs1:/tmp/cvs-serv31640/CSPSimDLL

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio/CSPSimDLL added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio CSPSim.dsw,NONE,1.1.2.1

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv31555

Added Files:
      Tag: simdata
	CSPSim.dsw 
Log Message:
no message

--- NEW FILE: CSPSim.dsw ---
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

###############################################################################

Project: "CSPSimAppli"=".\CSPSimAppli\CSPSimAppli.dsp" - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
}}}

###############################################################################

Project: "CSPSimDLL"=".\CSPSimDLL\CSPSimDLL.dsp" - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
}}}

###############################################################################

Global:

Package=<5>
{{{
}}}

Package=<3>
{{{
}}}

###############################################################################

[Csp-commits] APPLICATIONS/CSPSim/VisualStudio - New directory

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio
In directory sc8-pr-cvs1:/tmp/cvs-serv30473/VisualStudio

Log Message:
Directory /cvsroot/csp/APPLICATIONS/CSPSim/VisualStudio added to the repository
--> Using per-directory sticky tag `simdata'

[Csp-commits] APPLICATIONS/CSPSim/Source AeroDynamics.cpp,1.1.2.1,1.1.2.2 AircraftObject.cpp,1.1.2.1,1.1.2.2 CSPSim.cpp,1.1.2.1,1.1.2.2 Colorspace.cpp,1.1.2.1,1.1.2.2 Config.cpp,1.1.2.1,1.1.2.2 DynamicObject.cpp,1.1.2.1,1.1.2.2 EventMapIndex.cpp,1.1.2.1,1.1.2.2 EventMapping.cpp,1.1.2.1,1.1.2.2 HID.cpp,1.1.2.1,1.1.2.2 InputInterface.cpp,1.1.2.1,1.1.2.2 LogoScreen.cpp,1.1.2.1,1.1.2.2 ObjectModel.cpp,1.1.2.1,1.1.2.2 SimObject.cpp,1.1.2.1,1.1.2.2 SimpleConfig.cpp,1.1.2.1,1.1.2.2 TerrainObject.cpp,1.1.2.1,1.1.2.2 VirtualBattlefield.cpp,1.1.2.1,1.1.2.2 main.cpp,1.1.2.1,1.1.2.2

[<de...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv30307

Modified Files:
      Tag: simdata
	AeroDynamics.cpp AircraftObject.cpp CSPSim.cpp Colorspace.cpp 
	Config.cpp DynamicObject.cpp EventMapIndex.cpp 
	EventMapping.cpp HID.cpp InputInterface.cpp LogoScreen.cpp 
	ObjectModel.cpp SimObject.cpp SimpleConfig.cpp 
	TerrainObject.cpp VirtualBattlefield.cpp main.cpp 
Log Message:
no message

Index: AeroDynamics.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AeroDynamics.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** AeroDynamics.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- AeroDynamics.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 30,33 ****
--- 30,34 ----
  #include <SimData/InterfaceRegistry.h>
  #include <SimData/Math.h>
+ #include <SimData/Quaternion.h>
  
  using simdata::RadiansToDegrees;
***************
*** 53,57 ****
  
  void AeroDynamics::pack(simdata::Packer& p) const {
! 	simdata::Object::pack(p);
  	
  	p.pack(m_WingSpan);
--- 54,58 ----
  
  void AeroDynamics::pack(simdata::Packer& p) const {
! 	Object::pack(p);
  	
  	p.pack(m_WingSpan);
***************
*** 106,110 ****
  
  void AeroDynamics::unpack(simdata::UnPacker& p) {
! 	simdata::Object::unpack(p);
  
  	p.unpack(m_WingSpan);
--- 107,111 ----
  
  void AeroDynamics::unpack(simdata::UnPacker& p) {
! 	Object::unpack(p);
  
  	p.unpack(m_WingSpan);
***************
*** 699,703 ****
  simdata::Vector3 AeroDynamics::LocalToBody(const simdata::Vector3 & vec )
  {
! 	return QVRotate( qOrientation.Bar(), vec );
  }
  
--- 700,704 ----
  simdata::Vector3 AeroDynamics::LocalToBody(const simdata::Vector3 & vec )
  {
! 	return simdata::QVRotate( qOrientation.Bar(), vec );
  }
  
***************
*** 705,709 ****
  simdata::Vector3 AeroDynamics::BodyToLocal(const simdata::Vector3 & vec )
  {
! 	return QVRotate( qOrientation, vec );
  }
  
--- 706,710 ----
  simdata::Vector3 AeroDynamics::BodyToLocal(const simdata::Vector3 & vec )
  {
! 	return simdata::QVRotate( qOrientation, vec );
  }
  

Index: AircraftObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftObject.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** AircraftObject.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- AircraftObject.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 188,192 ****
  	m_Aileron = m_AileronInput * m_AileronMax * 0.017;
  	m_Elevator = m_ElevatorInput * m_ElevatorMax * 0.017;
! 	m_Throttle = (m_ThrottleInput+1.0) * 0.5;
  }
  
--- 188,192 ----
  	m_Aileron = m_AileronInput * m_AileronMax * 0.017;
  	m_Elevator = m_ElevatorInput * m_ElevatorMax * 0.017;
! 	m_Throttle = (-m_ThrottleInput+1.0) * 0.5;
  }
  

Index: CSPSim.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/CSPSim.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** CSPSim.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- CSPSim.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 23,27 ****
   */
  
! #ifdef WIN32
  #include <windows.h>
  #endif
--- 23,27 ----
   */
  
! #ifdef _WIN32
  #include <windows.h>
  #endif
***************
*** 38,42 ****
  #include "DT_drawtext.h"
  
! #include "DemeterException.h"
  
  #include "Config.h"
--- 38,42 ----
  #include "DT_drawtext.h"
  
! //#include "DemeterException.h"
  
  #include "Config.h"

Index: Colorspace.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Colorspace.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Colorspace.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- Colorspace.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 13,18 ****
   */
  
! #include "Color.h"
! #include <stdio.h>
  
  #define PI 3.14159265358979323846264338327950288419716939937510
--- 13,18 ----
   */
  
! #include "Colorspace.h"
! //#include <stdio.h>
  
  #define PI 3.14159265358979323846264338327950288419716939937510
***************
*** 815,819 ****
  	"HLS", "HSV", "RGB"};
  
! void Color::set(float A, float B, float C, space_t S=RGB, bool check) {
  	if (check) {
  		switch (S) {
--- 815,819 ----
  	"HLS", "HSV", "RGB"};
  
! void Color::set(float A, float B, float C, space_t S, bool check) {
  	if (check) {
  		switch (S) {
***************
*** 1067,1070 ****
--- 1067,1071 ----
  		<< c.getB() << ", "
  		<< c.getC() << "]";
+ 	return os;
  }
  

Index: Config.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Config.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Config.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- Config.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 1,2 ****
--- 1,7 ----
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning (disable : 4786)
+ # endif
+ 
+ 
  #include "Config.h"
  #include "Platform.h"
***************
*** 13,17 ****
          try {
                  found_config = g_Config.open(ini_path);
!         } catch (ConfigError &e) {
                  return false;
          }
--- 18,22 ----
          try {
                  found_config = g_Config.open(ini_path);
!         } catch (ConfigError &) {
                  return false;
          }
***************
*** 21,23 ****
--- 26,29 ----
          return found_config;
  }
+ 
  

Index: DynamicObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/DynamicObject.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** DynamicObject.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- DynamicObject.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 140,148 ****
  	if (m_Placer) {
  		simdata::Vector3 motion = m_PrevPosition - m_LocalPosition;
! 		simdata::Vector3 motionBody = QVRotate(m_qOrientation.Bar(), motion);
  		osg::BoundingSphere s = m_rpNode.get()->getBound();
  		float r = s.radius();
  		osg::Vec3 c = s.center();
! 		osg::Vec3Array* pl = osgNew osg::Vec3Array;
  		osg::Vec3 B(0.0,-0.8 * r, 0.0);
  		B = B + osg::Vec3(motionBody.x, motionBody.y, motionBody.z);
--- 140,148 ----
  	if (m_Placer) {
  		simdata::Vector3 motion = m_PrevPosition - m_LocalPosition;
! 		simdata::Vector3 motionBody = simdata::QVRotate(m_qOrientation.Bar(), motion);
  		osg::BoundingSphere s = m_rpNode.get()->getBound();
  		float r = s.radius();
  		osg::Vec3 c = s.center();
! 		osg::Vec3Array* pl = new osg::Vec3Array;
  		osg::Vec3 B(0.0,-0.8 * r, 0.0);
  		B = B + osg::Vec3(motionBody.x, motionBody.y, motionBody.z);

Index: EventMapIndex.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/EventMapIndex.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** EventMapIndex.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- EventMapIndex.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 23,26 ****
--- 23,34 ----
   **/
  
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning(disable : 4786)
+ # endif
+ 
+ #ifdef _WIN32
+ #include <assert.h>
+ #endif
+ 
  #include "EventMapIndex.h"
  #include "LogStream.h"

Index: EventMapping.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/EventMapping.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** EventMapping.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- EventMapping.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 22,29 ****
--- 22,36 ----
   *
   **/
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning(disable : 4786)
+ # endif
  
  #include "EventMapping.h"
  //#include "InputInterface.h"
  #include "SDL_events.h"
+ 
+ #ifdef _WIN32
+ #include <assert.h>
+ #endif
  
  #include <iostream>

Index: HID.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/HID.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** HID.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- HID.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 22,25 ****
--- 22,28 ----
   *
   **/
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning(disable : 4786)
+ # endif
  
  #include "HID.h"
***************
*** 119,123 ****
  
  void VirtualHID::setJoystickModifier(int jmod) {
! 	m_JoystickModifier = jmod;
  }
  
--- 122,126 ----
  
  void VirtualHID::setJoystickModifier(int jmod) {
! 	m_JoystickModifier = (jmod != 0);
  }
  

Index: InputInterface.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/InputInterface.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** InputInterface.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- InputInterface.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 22,25 ****
--- 22,28 ----
   *
   **/
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning(disable : 4786)
+ # endif
  
  #include "InputInterface.h"

Index: LogoScreen.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/LogoScreen.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** LogoScreen.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- LogoScreen.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 1,2 ****
--- 1,6 ----
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning(disable : 4786)
+ # endif
+ 
  #include <iostream>
  

Index: ObjectModel.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/ObjectModel.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ObjectModel.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- ObjectModel.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 53,57 ****
  
  void ObjectModel::pack(simdata::Packer& p) const {
! 	simdata::Object::pack(p);
  	p.pack(m_ModelPath);
  	p.pack(m_Rotation);
--- 53,57 ----
  
  void ObjectModel::pack(simdata::Packer& p) const {
! 	Object::pack(p);
  	p.pack(m_ModelPath);
  	p.pack(m_Rotation);
***************
*** 63,67 ****
  
  void ObjectModel::unpack(simdata::UnPacker& p) {
! 	simdata::Object::unpack(p);
  	p.unpack(m_ModelPath);
  	p.unpack(m_Rotation);
--- 63,67 ----
  
  void ObjectModel::unpack(simdata::UnPacker& p) {
! 	Object::unpack(p);
  	p.unpack(m_ModelPath);
  	p.unpack(m_Rotation);
***************
*** 105,113 ****
  	m_Axis0.Normalize();
  	// orthogonalize
! 	m_Axis1 = m_Axis1 - m_Axis0 * Dot(m_Axis0, m_Axis1);
  	assert(m_Axis1.Length() > 0.0);
  	m_Axis1.Normalize();
  	// find third axis
! 	simdata::Vector3 axis2 = Cross(m_Axis0, m_Axis1);
  	
  	simdata::Matrix3 o(m_Axis0.x, m_Axis0.y, m_Axis0.z, m_Axis1.x, m_Axis1.y, m_Axis1.z, axis2.x, axis2.y, axis2.z);
--- 105,113 ----
  	m_Axis0.Normalize();
  	// orthogonalize
! 	m_Axis1 = m_Axis1 - m_Axis0 * simdata::Dot(m_Axis0, m_Axis1);
  	assert(m_Axis1.Length() > 0.0);
  	m_Axis1.Normalize();
  	// find third axis
! 	simdata::Vector3 axis2 = simdata::Cross(m_Axis0, m_Axis1);
  	
  	simdata::Matrix3 o(m_Axis0.x, m_Axis0.y, m_Axis0.z, m_Axis1.x, m_Axis1.y, m_Axis1.z, axis2.x, axis2.y, axis2.z);

Index: SimObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/SimObject.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** SimObject.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- SimObject.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 99,103 ****
  
  void SimObject::pack(simdata::Packer& p) const {
! 	simdata::Object::pack(p);
  	p.pack(m_Army);
  	p.pack(m_Model);
--- 99,103 ----
  
  void SimObject::pack(simdata::Packer& p) const {
! 	Object::pack(p);
  	p.pack(m_Army);
  	p.pack(m_Model);
***************
*** 105,109 ****
  
  void SimObject::unpack(simdata::UnPacker& p) {
! 	simdata::Object::unpack(p);
  	p.unpack(m_Army);
  	p.unpack(m_Model);
--- 105,109 ----
  
  void SimObject::unpack(simdata::UnPacker& p) {
! 	Object::unpack(p);
  	p.unpack(m_Army);
  	p.unpack(m_Model);
***************
*** 345,349 ****
  	// this needs 2 upgrades; 
  	// first one is: working with quat and only quat; 
! 	// second is: make an osg app() callback
  
  	CSP_LOG(CSP_APP, CSP_DEBUG, "SimObject::updateScene() ID:"  << m_iObjectID );
--- 345,349 ----
  	// this needs 2 upgrades; 
  	// first one is: working with quat and only quat; 
! 	// second is: make an osg update()/draw()? callback
  
  	CSP_LOG(CSP_APP, CSP_DEBUG, "SimObject::updateScene() ID:"  << m_iObjectID );

Index: SimpleConfig.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/SimpleConfig.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** SimpleConfig.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- SimpleConfig.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 29,36 ****
--- 29,45 ----
   */
  
+ # if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning (disable : 4786)
+ # endif
+ 
+ #ifdef _WIN32
+ #include <assert.h>
+ #define snprintf _snprintf
+ #endif
  
  #include "SimpleConfig.h"
  #include "Platform.h"
  
+ 
  #include <string>
  #include <vector>
***************
*** 41,44 ****
--- 50,54 ----
  
  #include "compiler.h"
+ 
  #include STL_SSTREAM
  

Index: TerrainObject.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/TerrainObject.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** TerrainObject.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- TerrainObject.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 69,73 ****
  void TerrainObject::pack(simdata::Packer& p) const 
  {
! 	simdata::Object::pack(p);
  	p.pack(m_DynamicTextures);
  	p.pack(m_TextureCompression);
--- 69,73 ----
  void TerrainObject::pack(simdata::Packer& p) const 
  {
! 	Object::pack(p);
  	p.pack(m_DynamicTextures);
  	p.pack(m_TextureCompression);
***************
*** 95,99 ****
  void TerrainObject::unpack(simdata::UnPacker& p)
  {
! 	simdata::Object::unpack(p);
  	p.unpack(m_DynamicTextures);
  	p.unpack(m_TextureCompression);
--- 95,99 ----
  void TerrainObject::unpack(simdata::UnPacker& p)
  {
! 	Object::unpack(p);
  	p.unpack(m_DynamicTextures);
  	p.unpack(m_TextureCompression);

Index: VirtualBattlefield.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/VirtualBattlefield.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** VirtualBattlefield.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- VirtualBattlefield.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 223,227 ****
  	// OSG can find itself the plugins.
  #ifdef _WIN32
! 	osgDB::setLibraryFilePathList("../DemoPackage");
  #endif
  
--- 223,227 ----
  	// OSG can find itself the plugins.
  #ifdef _WIN32
! 	osgDB::setLibraryFilePathList("../Bin");
  #endif
  
***************
*** 242,246 ****
  	osg::ClearNode* earthSky = osgNew osg::ClearNode;
  	earthSky->setRequiresClear(false); // we've got base and sky to do it.
! 	//earthSky->setRequiresClear(true); // we've got base and sky to do it.
  
  	// use a transform to make the sky and base around with the eye point.
--- 242,246 ----
  	osg::ClearNode* earthSky = osgNew osg::ClearNode;
  	earthSky->setRequiresClear(false); // we've got base and sky to do it.
! 	//earthSky->setRequiresClear(true);
  
  	// use a transform to make the sky and base around with the eye point.
***************
*** 675,680 ****
  	do {
  		if (++i == objectList.end()) i = objectList.begin();
! 		if ((human >= 0) && (*i)->isHuman() != (bool)human) continue;
! 		if ((local >= 0) && (*i)->isLocal() != (bool)local) continue;
  		break;
  	} while (object.ptr() != (*i).ptr());
--- 675,680 ----
  	do {
  		if (++i == objectList.end()) i = objectList.begin();
! 		if ((human >= 0) && (*i)->isHuman() != (human != 0)) continue;
! 		if ((local >= 0) && (*i)->isLocal() != (local != 0)) continue;
  		break;
  	} while (object.ptr() != (*i).ptr());

Index: main.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/main.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** main.cpp	26 Jan 2003 23:15:56 -0000	1.1.2.1
--- main.cpp	2 Feb 2003 15:52:45 -0000	1.1.2.2
***************
*** 1,11 ****
- #include "stdinc.h"
- #include "SDL.h"
  #include "Config.h"
  #include "CSPSim.h"
! 
  
  int main(int argc, char *argv[])
  {
! 	if (!openConfig("../Data/CSPSim.ini")) return 0;
          int level = g_Config.getInt("Debug", "LoggingLevel", 0, true);
  
--- 1,9 ----
  #include "Config.h"
  #include "CSPSim.h"
! #include "LogStream.h"
  
  int main(int argc, char *argv[])
  {
!    if (!openConfig("../Data/CSPSim.ini")) return 0;
          int level = g_Config.getInt("Debug", "LoggingLevel", 0, true);
  
***************
*** 23,27 ****
  	csplog().set_output (cerr);
  	logfile.close();
! 
  	return 0;
  }
--- 21,25 ----
  	csplog().set_output (cerr);
  	logfile.close();
!     
  	return 0;
  }