Menu
▾
▴
csp-commits — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(140) |
Feb
(98) |
Mar
(152) |
Apr
(104) |
May
(71) |
Jun
(94) |
Jul
(169) |
Aug
(83) |
Sep
(47) |
Oct
(134) |
Nov
(7) |
Dec
(20) |
| 2004 |
Jan
(41) |
Feb
(14) |
Mar
(42) |
Apr
(47) |
May
(68) |
Jun
(143) |
Jul
(65) |
Aug
(29) |
Sep
(40) |
Oct
(34) |
Nov
(33) |
Dec
(97) |
| 2005 |
Jan
(29) |
Feb
(30) |
Mar
(9) |
Apr
(37) |
May
(13) |
Jun
(31) |
Jul
(22) |
Aug
(23) |
Sep
|
Oct
(37) |
Nov
(34) |
Dec
(117) |
| 2006 |
Jan
(48) |
Feb
(6) |
Mar
(2) |
Apr
(71) |
May
(10) |
Jun
(16) |
Jul
(7) |
Aug
(1) |
Sep
(14) |
Oct
(17) |
Nov
(25) |
Dec
(26) |
| 2007 |
Jan
(8) |
Feb
(2) |
Mar
(7) |
Apr
(26) |
May
|
Jun
(12) |
Jul
(30) |
Aug
(14) |
Sep
(9) |
Oct
(4) |
Nov
(7) |
Dec
(6) |
| 2008 |
Jan
(10) |
Feb
(10) |
Mar
(6) |
Apr
(8) |
May
|
Jun
(10) |
Jul
(18) |
Aug
(15) |
Sep
(16) |
Oct
(5) |
Nov
(3) |
Dec
(10) |
| 2009 |
Jan
(11) |
Feb
(2) |
Mar
|
Apr
(15) |
May
(31) |
Jun
(18) |
Jul
(11) |
Aug
(26) |
Sep
(52) |
Oct
(17) |
Nov
(4) |
Dec
|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mk...@us...> - 2003-10-10 00:24:40
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source In directory sc8-pr-cvs1:/tmp/cvs-serv24904/Source Modified Files: Date.cpp Log Message: Index: Date.cpp =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Date.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Date.cpp 15 Aug 2003 08:05:10 -0000 1.7 --- Date.cpp 10 Oct 2003 00:24:35 -0000 1.8 *************** *** 23,26 **** --- 23,34 ---- + #ifdef _WIN32 + #include <Windows.h> + #include <ctime> + #else + #include <sys/time.h> + #include <unistd.h> + #endif + NAMESPACE_SIMDATA *************** *** 31,36 **** #ifdef _WIN32 - #include <Windows.h> - #include <ctime> static LARGE_INTEGER _tstart, _tend; static LARGE_INTEGER freq; --- 39,42 ---- *************** *** 70,76 **** #else - - #include <sys/time.h> - #include <unistd.h> static struct timeval _tstart, _tend; --- 76,79 ---- |
|
From: <mk...@us...> - 2003-10-10 00:21:27
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv24437/Source
Modified Files:
Real.cpp
Log Message:
Index: Real.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Real.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Real.cpp 6 Aug 2003 06:36:25 -0000 1.3
--- Real.cpp 10 Oct 2003 00:21:23 -0000 1.4
***************
*** 23,26 ****
--- 23,28 ----
#include <SimData/Pack.h>
+ #include <sstream>
+
NAMESPACE_SIMDATA
***************
*** 88,94 ****
std::string Real:: asString() const {
! char fmt[128];
! snprintf(fmt, 127, "%f", _value);
! return std::string(fmt);
}
--- 90,96 ----
std::string Real:: asString() const {
! std::stringstream ss;
! ss << _value;
! return ss.str();
}
|
|
From: <mk...@us...> - 2003-10-09 23:50:51
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv19750
Added Files:
Tag: systems
System.cpp
Log Message:
--- NEW FILE: System.cpp ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2003 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 System.cpp
*
* Vehicle systems base classes and infrastructure.
*
**/
#include <System.h>
#include <DataRecorder.h>
#include <PhysicsModel.h>
#include <Controller.h>
SIMDATA_REGISTER_INTERFACE(SystemsModel)
void System::setModel(SystemsModel *model) {
assert(m_Model == 0 || model == 0);
m_Model = model;
if (model != 0) {
Bus::Ref bus = model->getBus();
registerChannels(bus.get());
}
}
void SystemsModel::setDataRecorder(DataRecorder *recorder) {
if (!recorder) return;
// TODO pass recorder to subsystems
}
simdata::Ref<PhysicsModel> SystemsModel::getPhysicsModel() const {
return m_PhysicsModel;
}
simdata::Ref<Controller> SystemsModel::getController() const {
return m_Controller;
}
void SystemsModel::postCreate() {
System::postCreate();
if (m_PhysicsModel.valid()) {
CSP_LOG(OBJECT, DEBUG, "Adding PhysicsModel (" << m_PhysicsModel->getClassName() << ")");
addChild(m_PhysicsModel.get());
}
if (m_Controller.valid()) {
CSP_LOG(OBJECT, DEBUG, "Adding Controller (" << m_Controller->getClassName() << ")");
addChild(m_Controller.get());
}
}
void SystemsModel::serialize(simdata::Archive &archive) {
System::serialize(archive);
archive(m_PhysicsModel);
// XXX temporarily disabled (no controller classes yet)
//archive(m_Controller);
}
void SystemsModel::getInfo(InfoList &info) {
accept(new InfoVisitor(info));
}
|
|
From: <mk...@us...> - 2003-10-09 23:40:45
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv18516/Source
Modified Files:
Tag: systems
Makefile.in
Log Message:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Makefile.in,v
retrieving revision 1.20.2.4
retrieving revision 1.20.2.5
diff -C2 -d -r1.20.2.4 -r1.20.2.5
*** Makefile.in 9 Oct 2003 23:39:28 -0000 1.20.2.4
--- Makefile.in 9 Oct 2003 23:40:41 -0000 1.20.2.5
***************
*** 98,102 ****
DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep
DEPFILTER =
! DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR/Systems) > /dev/null 2>&1 || :)
.PHONY: clean-deps clean all default
--- 98,102 ----
DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep
DEPFILTER =
! DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR)/Systems > /dev/null 2>&1 || :)
.PHONY: clean-deps clean all default
|
|
From: <mk...@us...> - 2003-10-09 23:39:32
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv18288
Modified Files:
Tag: systems
Makefile.in
Log Message:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Makefile.in,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -C2 -d -r1.20.2.3 -r1.20.2.4
*** Makefile.in 9 Oct 2003 23:34:50 -0000 1.20.2.3
--- Makefile.in 9 Oct 2003 23:39:28 -0000 1.20.2.4
***************
*** 98,102 ****
DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep
DEPFILTER =
! DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater > /dev/null 2>&1 || :)
.PHONY: clean-deps clean all default
--- 98,102 ----
DEPFILES = $(addprefix $(DEPDIR)/,$(addsuffix .d, $(SOURCES))) $(DEPDIR)/cCSP.i.swigdep
DEPFILTER =
! DEPS_MAGIC := $(shell mkdir $(DEPDIR) $(DEPDIR)/Theater $(DEPDIR/Systems) > /dev/null 2>&1 || :)
.PHONY: clean-deps clean all default
|
|
From: <mk...@us...> - 2003-10-09 23:37:09
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems
In directory sc8-pr-cvs1:/tmp/cvs-serv18074/Source/Systems
Modified Files:
Tag: systems
AircraftFlightSensors.cpp AircraftInputSystem.cpp
AircraftSimpleFCS.cpp
Log Message:
Index: AircraftFlightSensors.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems/Attic/AircraftFlightSensors.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
*** AircraftFlightSensors.cpp 9 Oct 2003 23:27:58 -0000 1.1.2.1
--- AircraftFlightSensors.cpp 9 Oct 2003 23:37:06 -0000 1.1.2.2
***************
*** 24,28 ****
! #include <AircraftSystems/AircraftFlightSensors.h>
#include <KineticsChannels.h>
#include <Atmosphere.h>
--- 24,28 ----
! #include <Systems/AircraftFlightSensors.h>
#include <KineticsChannels.h>
#include <Atmosphere.h>
Index: AircraftInputSystem.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems/Attic/AircraftInputSystem.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
*** AircraftInputSystem.cpp 9 Oct 2003 23:27:58 -0000 1.1.2.1
--- AircraftInputSystem.cpp 9 Oct 2003 23:37:06 -0000 1.1.2.2
***************
*** 24,28 ****
! #include <AircraftSystems/AircraftInputSystem.h>
--- 24,28 ----
! #include <Systems/AircraftInputSystem.h>
Index: AircraftSimpleFCS.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems/Attic/AircraftSimpleFCS.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
*** AircraftSimpleFCS.cpp 9 Oct 2003 23:27:58 -0000 1.1.2.1
--- AircraftSimpleFCS.cpp 9 Oct 2003 23:37:06 -0000 1.1.2.2
***************
*** 24,28 ****
! #include <AircraftSystems/AircraftSimpleFCS.h>
#include <SimData/Math.h>
--- 24,28 ----
! #include <Systems/AircraftSimpleFCS.h>
#include <SimData/Math.h>
|
|
From: <mk...@us...> - 2003-10-09 23:34:53
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv17803
Modified Files:
Tag: systems
Makefile.in
Log Message:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Makefile.in,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -C2 -d -r1.20.2.2 -r1.20.2.3
*** Makefile.in 29 Sep 2003 06:46:11 -0000 1.20.2.2
--- Makefile.in 9 Oct 2003 23:34:50 -0000 1.20.2.3
***************
*** 24,30 ****
SOURCES = \
! AircraftSystems/AircraftFlightSensors.cpp \
! AircraftSystems/AircraftInputSystem.cpp \
! AircraftSystems/AircraftSimpleFCS.cpp \
AircraftObject.cpp \
AircraftPhysicsModel.cpp \
--- 24,30 ----
SOURCES = \
! Systems/AircraftFlightSensors.cpp \
! Systems/AircraftInputSystem.cpp \
! Systems/AircraftSimpleFCS.cpp \
AircraftObject.cpp \
AircraftPhysicsModel.cpp \
|
|
From: <mk...@us...> - 2003-10-09 23:33:22
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv17690
Added Files:
Tag: systems
KineticsChannels.cpp
Log Message:
--- NEW FILE: KineticsChannels.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 KineticsChannels.cpp
*
**/
#include "KineticsChannels.h"
namespace bus {
const char *Kinetics::Attitude = "Kinetics.Attitude";
const char *Kinetics::AngularVelocity = "Kinetics.AngularVelocity";
const char *Kinetics::Velocity = "Kinetics.Velocity";
const char *Kinetics::Position = "Kinetics.Position";
const char *Kinetics::NearGround = "Kinetics.NearGround";
const char *Kinetics::Mass = "Kinetics.Mass";
const char *Kinetics::Inertia= "Kinetics.Inertia";
const char *Kinetics::InertiaInverse = "Kinetics.InertiaInverse";
const char *Kinetics::GroundZ = "Kinetics.GroundZ";
const char *Kinetics::GroundN = "Kinetics.GroundN";
}
|
|
From: <mk...@us...> - 2003-10-09 23:32:54
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv17610
Added Files:
Tag: systems
KineticsChannels.h
Log Message:
--- NEW FILE: KineticsChannels.h ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2003 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 KineticChannels.h
*
**/
#ifndef __KINETICCHANNELS_H__
#define __KINETICCHANNELS_H__
namespace bus {
struct Kinetics {
static const char *NearGround;
static const char *Position;
static const char *Velocity;
static const char *AngularVelocity;
static const char *Attitude;
static const char *Mass;
static const char *Inertia;
static const char *InertiaInverse;
static const char *GroundN;
static const char *GroundZ;
};
}
#endif // __KINETICCHANNELS_H__
|
|
From: <mk...@us...> - 2003-10-09 23:28:02
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems
In directory sc8-pr-cvs1:/tmp/cvs-serv16934
Added Files:
Tag: systems
AircraftFlightSensors.cpp AircraftInputSystem.cpp
AircraftSimpleFCS.cpp
Log Message:
initial aircraft systems
--- NEW FILE: AircraftFlightSensors.cpp ---
// Combat Simulator Project - CSPSim
// Copyright (C) 2002, 2003 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 AircraftFlightSensors.cpp
*
**/
#include <AircraftSystems/AircraftFlightSensors.h>
#include <KineticsChannels.h>
#include <Atmosphere.h>
#include <CSPSim.h>
using bus::Kinetics;
SIMDATA_REGISTER_INTERFACE(AircraftFlightSensors)
double AircraftFlightSensors::onUpdate(double dt) {
simdata::Vector3 pos = b_Position->value();
Atmosphere const *atmosphere = CSPSim::theSim->getAtmosphere();
if (atmosphere) {
b_Density->value() = atmosphere->getDensity(pos.z());
b_Pressure->value() = atmosphere->getPressure(pos.z());
simdata::Vector3 wind = atmosphere->getWind(pos);
wind += atmosphere->getTurbulence(pos, m_Distance);
b_WindVelocity->value() = wind;
m_Distance += (wind - b_Velocity->value()).length() * dt;
} else {
b_Density->value() = 1.25; // nominal sea-level air density
b_WindVelocity->value() = simdata::Vector3::ZERO;
}
return 0.101;
}
void AircraftFlightSensors::importChannels(Bus *bus) {
assert(bus!=0);
b_Position = bus->getChannel(Kinetics::Position);
b_Velocity = bus->getChannel(Kinetics::Velocity);
}
void AircraftFlightSensors::registerChannels(Bus *bus) {
assert(bus!=0);
b_WindVelocity = bus->registerLocalDataChannel<simdata::Vector3>("Conditions.WindVelocity", simdata::Vector3::ZERO);
b_Pressure = bus->registerLocalDataChannel<double>("Conditions.Pressure", 100000.0);
b_Density = bus->registerLocalDataChannel<double>("Conditions.Density", 1.25);
b_Temperature = bus->registerLocalDataChannel<double>("Conditions.Temperature", 300);
}
--- NEW FILE: AircraftInputSystem.cpp ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2002, 2003 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 AircraftInputSystem.cpp
*
**/
#include <AircraftSystems/AircraftInputSystem.h>
SIMDATA_REGISTER_INTERFACE(AircraftInputSystem)
AircraftInputSystem::AircraftInputSystem():
m_ThrottleInput(0.2)
{
BIND_AXIS("THROTTLE", setThrottle);
BIND_AXIS("AILERON", setRoll);
BIND_AXIS("ELEVATOR", setPitch);
BIND_AXIS("RUDDER", setRudder);
BIND_AXIS("AIRBRAKE", setAirbrake);
BIND_AXIS("WHEEL_BRAKE", setWheelBrake);
BIND_ACTION("INC_THROTTLE", IncThrottle);
BIND_ACTION("STOP_INC_THROTTLE", noIncThrottle);
BIND_ACTION("DEC_THROTTLE", DecThrottle);
BIND_ACTION("STOP_DEC_THROTTLE", noDecThrottle);
BIND_ACTION("INC_AILERON", IncRoll);
BIND_ACTION("STOP_INC_AILERON", noIncRoll);
BIND_ACTION("DEC_AILERON", DecRoll);
BIND_ACTION("STOP_DEC_AILERON", noDecRoll);
BIND_ACTION("INC_ELEVATOR", IncPitch);
BIND_ACTION("STOP_INC_ELEVATOR", noIncPitch);
BIND_ACTION("DEC_ELEVATOR", DecPitch);
BIND_ACTION("STOP_DEC_ELEVATOR", noDecPitch);
BIND_ACTION("INC_RUDDER", IncRudder);
BIND_ACTION("STOP_INC_RUDDER", noIncRudder);
BIND_ACTION("DEC_RUDDER", DecRudder);
BIND_ACTION("STOP_DEC_RUDDER", noDecRudder);
BIND_ACTION("INC_AIRBRAKE", IncAirbrake);
BIND_ACTION("DEC_AIRBRAKE", DecAirbrake);
BIND_ACTION("OPEN_AIRBRAKE", OpenAirbrake);
BIND_ACTION("CLOSE_AIRBRAKE", CloseAirbrake);
BIND_ACTION("WHEEL_BRAKE_PULSE", WheelBrakePulse);
BIND_ACTION("WHEEL_BRAKE_ON", WheelBrakeOn);
BIND_ACTION("WHEEL_BRAKE_OFF", WheelBrakeOff);
BIND_ACTION("WHEEL_BRAKE_TOGGLE", WheelBrakeToggle);
}
void AircraftInputSystem::registerChannels(Bus *bus) {
m_PitchInput.connect(bus, "ControlInputs.PitchInput");
m_RollInput.connect(bus, "ControlInputs.RollInput");
m_RudderInput.connect(bus, "ControlInputs.RudderInput");
m_LeftBrakeInput.connect(bus, "ControlInputs.LeftBrakeInput");
m_RightBrakeInput.connect(bus, "ControlInputs.RightBrakeInput");
m_ThrottleInput.connect(bus, "ControlInputs.ThrottleInput");
m_AirbrakeInput.connect(bus, "ControlInputs.AirbrakeInput");
}
void AircraftInputSystem::importChannels(Bus *bus) {
}
double AircraftInputSystem::onUpdate(double dt)
{
m_PitchInput.update(dt);
m_RollInput.update(dt);
m_RudderInput.update(dt);
m_LeftBrakeInput.update(dt);
m_RightBrakeInput.update(dt);
m_ThrottleInput.update(dt);
m_AirbrakeInput.update(dt);
return 0.05;
}
// input event callbacks
void AircraftInputSystem::setAirbrake(double x) {
m_AirbrakeInput.setValue(x);
}
void AircraftInputSystem::setThrottle(double x) {
m_ThrottleInput.setValue(0.5 *(1.0 - x));
}
void AircraftInputSystem::setRudder(double x)
{
m_RudderInput.setValue(x);
}
void AircraftInputSystem::IncRudder() {
m_RudderInput.setIncrement(1.0);
}
void AircraftInputSystem::noIncRudder() {
m_RudderInput.stopIncrement();
m_RudderInput.setDecay(-30);
}
void AircraftInputSystem::DecRudder() {
m_RudderInput.setIncrement(-1.0);
}
void AircraftInputSystem::noDecRudder() {
m_RudderInput.stopDecrement();
m_RudderInput.setDecay(30);
}
void AircraftInputSystem::setRoll(double x)
{
m_RollInput.setValue(x);
}
void AircraftInputSystem::setPitch(double x)
{
m_PitchInput.setValue(x);
}
void AircraftInputSystem::IncPitch() {
m_PitchInput.setIncrement(1.0);
}
void AircraftInputSystem::noIncPitch() {
m_PitchInput.stopIncrement();
m_PitchInput.setDecay(30);
}
void AircraftInputSystem::DecPitch() {
m_PitchInput.setIncrement(-1.0);
}
void AircraftInputSystem::noDecPitch() {
m_PitchInput.stopDecrement();
m_PitchInput.setDecay(30);
}
void AircraftInputSystem::IncRoll() {
m_RollInput.setIncrement(1.0);
}
void AircraftInputSystem::noIncRoll() {
m_RollInput.stopIncrement();
m_RollInput.setDecay(30);
}
void AircraftInputSystem::DecRoll() {
m_RollInput.setIncrement(-1.0);
}
void AircraftInputSystem::noDecRoll() {
m_RollInput.stopDecrement();
m_RollInput.setDecay(30);
}
void AircraftInputSystem::IncThrottle() {
m_ThrottleInput.setIncrement(1.0);
}
void AircraftInputSystem::noIncThrottle() {
m_ThrottleInput.stopIncrement();
}
void AircraftInputSystem::DecThrottle() {
m_ThrottleInput.setIncrement(-1.0);
}
void AircraftInputSystem::noDecThrottle() {
m_ThrottleInput.stopDecrement();
}
void AircraftInputSystem::WheelBrakePulse() {
m_LeftBrakeInput.setValue(1.0);
m_LeftBrakeInput.setDecay(30);
m_RightBrakeInput.setValue(1.0);
m_RightBrakeInput.setDecay(30);
}
void AircraftInputSystem::WheelBrakeOn() {
m_LeftBrakeInput.setValue(1.0);
m_RightBrakeInput.setValue(1.0);
m_WheelBrakes = true;
}
void AircraftInputSystem::WheelBrakeOff() {
m_LeftBrakeInput.setValue(0.0);
m_RightBrakeInput.setValue(0.0);
m_WheelBrakes = false;
}
void AircraftInputSystem::WheelBrakeToggle() {
if (m_WheelBrakes) {
WheelBrakeOff();
} else {
WheelBrakeOn();
}
}
void AircraftInputSystem::setWheelBrake(double x) {
m_LeftBrakeInput.setValue(x);
m_RightBrakeInput.setValue(x);
}
void AircraftInputSystem::OpenAirbrake() {
m_AirbrakeInput.setValue(1.0);
}
void AircraftInputSystem::CloseAirbrake() {
m_AirbrakeInput.setValue(0.0);
}
void AircraftInputSystem::DecAirbrake() {
double v = std::max(0.0, m_AirbrakeInput.getValue() - 0.1);
m_AirbrakeInput.setValue(v);
}
void AircraftInputSystem::IncAirbrake() {
double v = std::min(0.0, m_AirbrakeInput.getValue() + 0.1);
m_AirbrakeInput.setValue(v);
}
--- NEW FILE: AircraftSimpleFCS.cpp ---
// Combat Simulator Project - FlightSim Demo
// Copyright (C) 2002, 2003 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 AircraftSimpleFCS.cpp
*
**/
#include <AircraftSystems/AircraftSimpleFCS.h>
#include <SimData/Math.h>
#include <sstream>
#include <iomanip>
using simdata::toRadians;
using simdata::toDegrees;
SIMDATA_REGISTER_INTERFACE(AircraftSimpleFCS)
AircraftSimpleFCS::AircraftSimpleFCS()
{
m_ElevatorLimit = 0.3;
m_ElevatorRate = 0.5;
m_AileronLimit = 0.3;
m_AileronRate = 0.5;
m_RudderLimit = 0.3;
m_RudderRate = 0.5;
m_AirbrakeLimit = 0.3;
m_AirbrakeRate = 0.1;
m_MaxG = 5.0;
m_MinG = -2.0;
}
void AircraftSimpleFCS::serialize(simdata::Archive &archive) {
System::serialize(archive);
archive(m_ElevatorLimit);
archive(m_ElevatorRate);
archive(m_AileronLimit);
archive(m_AileronRate);
archive(m_RudderLimit);
archive(m_RudderRate);
archive(m_AirbrakeLimit);
archive(m_AirbrakeRate);
archive(m_MaxG);
archive(m_MinG);
}
void AircraftSimpleFCS::convertXML() {
m_ElevatorLimit = toRadians(m_ElevatorLimit);
m_AileronLimit = toRadians(m_AileronLimit);
m_RudderLimit = toRadians(m_RudderLimit);
m_AirbrakeLimit = toRadians(m_AirbrakeLimit);
m_ElevatorRate = toRadians(m_ElevatorRate);
m_AileronRate = toRadians(m_AileronRate);
m_RudderRate = toRadians(m_RudderRate);
m_AirbrakeRate = toRadians(m_AirbrakeRate);
}
void AircraftSimpleFCS::postCreate() {
m_Elevator.setParameters(m_ElevatorRate, m_ElevatorLimit);
m_Aileron.setParameters(m_AileronRate, m_AileronLimit);
m_Rudder.setParameters(m_RudderRate, m_RudderLimit);
m_Airbrake.setParameters(m_AirbrakeRate, m_AirbrakeLimit);
}
void AircraftSimpleFCS::registerChannels(Bus *bus) {
m_Elevator.registerOutput(bus, "ControlSurfaces.ElevatorDeflection");
m_Aileron.registerOutput(bus, "ControlSurfaces.AileronDeflection");
m_Rudder.registerOutput(bus, "ControlSurfaces.RudderDeflection");
m_Airbrake.registerOutput(bus, "ControlSurfaces.AirbrakeDeflection");
}
void AircraftSimpleFCS::importChannels(Bus *bus) {
m_Elevator.bindInput(bus, "ControlInputs.PitchInput");
m_Aileron.bindInput(bus, "ControlInputs.RollInput");
m_Rudder.bindInput(bus, "ControlInputs.RudderInput");
m_Airbrake.bindInput(bus, "ControlInputs.AirbrakeInput");
}
double AircraftSimpleFCS::onUpdate(double dt)
{
// TODO add G control
m_Elevator.update(dt);
m_Aileron.update(dt);
m_Rudder.update(dt);
m_Airbrake.update(dt);
return 0.0;
}
void AircraftSimpleFCS::getInfo(InfoList &info) {
std::stringstream line;
line.setf(std::ios::fixed | std::ios::showpos);
line.precision(0);
line << "de: " << std::setw(3) << toDegrees(m_Elevator.getDeflectionAngle())
<< ", da: " << std::setw(3) << toDegrees(m_Aileron.getDeflectionAngle())
<< ", dr: " << std::setw(3) << toDegrees(m_Rudder.getDeflectionAngle())
<< ", dsb: " << std::setw(3) << toDegrees(m_Airbrake.getDeflectionAngle());
info.push_back(line.str());
}
#if 0
double FlightDynamics::controlIVbasis(double p_t) const {
double cIV = p_t * p_t * ( 3.0 - 2.0 * p_t);
return cIV;
}
double FlightDynamics::controlInputValue(double p_gForce) const {
// to reduce G, decrease deflection control surface
/* FIXME move to FCS class
if (p_gForce > m_GMax && m_ElevatorInput > 0.0) return 0.0;
if (p_gForce < m_GMin && m_ElevatorInput < 0.0) return 0.0;
if (m_Alpha > m_stallAOA && m_ElevatorInput > 0.0) return 0.0;
if (p_gForce > m_GMax - m_depsilon && m_ElevatorInput > 0.0) {
return controlIVbasis((m_GMax - p_gForce) / m_depsilon);
}
if ( p_gForce < m_GMin + m_depsilon && m_ElevatorInput < 0.0) {
return controlIVbasis((p_gForce - m_GMin) / m_depsilon);
}*/
return 1.0;
}
double u = 0.05 + dt;
m_ElevatorScale = (1.0 - u) * m_ElevatorScale + u * controlInputValue(m_GForce);
m_Elevator = m_ElevatorInput * m_ElevatorScale;
#endif
|
|
From: <mk...@us...> - 2003-10-09 23:27:11
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems In directory sc8-pr-cvs1:/tmp/cvs-serv16816/Systems Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Source/Systems added to the repository --> Using per-directory sticky tag `systems' |
|
From: <mk...@us...> - 2003-10-09 23:24:00
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems In directory sc8-pr-cvs1:/tmp/cvs-serv16333/Systems Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Include/Systems added to the repository --> Using per-directory sticky tag `systems' |
|
From: <mk...@us...> - 2003-10-05 17:49:23
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv22069/Include
Modified Files:
Tag: systems
Bus.h
Log Message:
fixed int->bool warning
Index: Bus.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Bus.h,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -d -r1.2.2.2 -r1.2.2.3
*** Bus.h 29 Sep 2003 06:46:11 -0000 1.2.2.2
--- Bus.h 5 Oct 2003 17:49:18 -0000 1.2.2.3
***************
*** 119,123 ****
/** Test if a channel is enabled.
*/
! bool isEnabled() const { return m_Mask & MASK_ENABLED; }
/** Test if this channel is shared.
--- 119,123 ----
/** Test if a channel is enabled.
*/
! bool isEnabled() const { return (m_Mask & MASK_ENABLED) != 0; }
/** Test if this channel is shared.
***************
*** 126,130 ****
* channels are read-only (except for the system that creates them).
*/
! bool isShared() const { return m_Mask & MASK_SHARED; }
protected:
--- 126,130 ----
* channels are read-only (except for the system that creates them).
*/
! bool isShared() const { return (m_Mask & MASK_SHARED) != 0; }
protected:
|
|
From: <mk...@us...> - 2003-09-29 07:00:18
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include/AircraftSystems In directory sc8-pr-cvs1:/tmp/cvs-serv25215/AircraftSystems Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Include/AircraftSystems added to the repository --> Using per-directory sticky tag `systems' |
|
From: <mk...@us...> - 2003-09-29 06:46:26
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft
In directory sc8-pr-cvs1:/tmp/cvs-serv26001/Data/XML/vehicles/aircraft
Modified Files:
Tag: systems
m2k.xml
Log Message:
Index: m2k.xml
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/XML/vehicles/aircraft/m2k.xml,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -d -r1.7.2.1 -r1.7.2.2
*** m2k.xml 16 Sep 2003 06:57:30 -0000 1.7.2.1
--- m2k.xml 29 Sep 2003 06:46:10 -0000 1.7.2.2
***************
*** 9,27 ****
<Path name="model">m2k.model</Path>
- <!--
- <Bool name="complex_physics">true</Bool>
-
- < these values come from a FS2k2 add-on >
- <Float name="aileron_min">-15.0</Float>
- <Float name="aileron_max">+19.5</Float>
- <Float name="elevator_min">-20.6</Float>
- <Float name="elevator_max">+27.5</Float>
- <Float name="rudder_min">-23.5</Float>
- <Float name="rudder_max">+23.5</Float>
-
- <Float name="airbrake_max">60.0</Float>
- <Float name="airbrake_rate">20.0</Float>
- -->
-
<!-- Mass/Inertial properties -->
<!-- empty mass = 7600 kg -->
--- 9,12 ----
***************
*** 34,60 ****
</Matrix>
! <Object class="AircraftDynamics" name="aircraft_dynamics">
!
! <Path name="flight_model">m2k.fm</Path>
!
! <Path name="gear_dynamics">m2k.gear</Path>
!
! <Object class="EngineDynamics" name="engine_dynamics">
! <List name="engine_set">
! <!-- real engine power is 9700 kg -->
! <!-- thrustdata values comes from F4SP3: f16.dat -->
! <Object class="Engine">
! <Path name="thrust_data">m2k.thrust</Path>
! <Float name="engine_idle_rpm">0.68</Float>
! <Float name="engine_ab_thrust">0.95</Float>
! <Vector name="thrust_direction">0.0 1.0 0.0</Vector>
! <Vector name="engine_offset">0.0 0.0 0.0</Vector>
! <Vector name="smoke_emitter_location">0.0 -5.5 0.0</Vector>
! </Object>
! </List>
! </Object>
! </Object>
!
! <Path name="human_systems">m2k.system</Path>
</Object>
--- 19,24 ----
</Matrix>
! <Path name="human_systems">m2k.systems</Path>
! <Path name="agent_systems">m2k.systems</Path>
</Object>
|
|
From: <mk...@us...> - 2003-09-29 06:46:26
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv26001/Data
Modified Files:
Tag: systems
CSPSim.ini
Log Message:
Index: CSPSim.ini
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Data/CSPSim.ini,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** CSPSim.ini 16 Sep 2003 06:57:30 -0000 1.14.2.1
--- CSPSim.ini 29 Sep 2003 06:46:10 -0000 1.14.2.2
***************
*** 7,12 ****
[Screen]
! Width = 800
! Height = 600
FullScreen = 0
--- 7,12 ----
[Screen]
! Width = 1024
! Height = 768
FullScreen = 0
|
|
From: <mk...@us...> - 2003-09-29 06:46:26
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim
In directory sc8-pr-cvs1:/tmp/cvs-serv26001
Modified Files:
Tag: systems
CHANGES.current TODO acinclude.m4 configure.in
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/CHANGES.current,v
retrieving revision 1.69.2.1
retrieving revision 1.69.2.2
diff -C2 -d -r1.69.2.1 -r1.69.2.2
*** CHANGES.current 16 Sep 2003 06:57:30 -0000 1.69.2.1
--- CHANGES.current 29 Sep 2003 06:46:10 -0000 1.69.2.2
***************
*** 1,4 ****
! Version 0.3.5 (in progress)
===========================
2003-09-15: onsight
--- 1,36 ----
! Branch 'systems' (in progress)
===========================
+
+ 2003-09-25: onsight
+ Integrated VI's patches for OSG 096 support. Changes
+ camera handling in near/far SceneView intances in
+ VirtualScene.cpp.
+
+ Various OSG 096 fixes:
+ * SceneView aspect ratio
+ * NearView projection matrix
+ * False horizon coloring
+ * Skydome (non-TEXDOME) coloring
+
+ 2003-09-17: onsight
+ Major refactoring of the aircraft components in terms of
+ the System/SystemsModel architecture. PhysicsModel is now
+ a System under the main SystemsModel for the vehicle. The
+ BaseDynamics classes are also Systems, although they only
+ function as dynamics when placed directly underneath the
+ PhysicsModel node. Almost all of the original inter-
+ component communications are now implemented through the
+ bus architecture. A few hacks remain, such as the landing
+ gear sprites (which needs to be overhauled in terms of
+ standard animations once a suitable 3d model is available).
+
+ Significant changes to the DataRecorder interface.
+
+ Changed the stats display interface to allow each System
+ to add its own info lines to the display by extending
+ getInfo().
+
+ Changes to the XML data for the m2k to support the new
+ vehicle interfaces.
2003-09-15: onsight
Index: TODO
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/TODO,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** TODO 18 Apr 2003 12:07:34 -0000 1.2
--- TODO 29 Sep 2003 06:46:10 -0000 1.2.2.1
***************
*** 23,24 ****
--- 23,72 ----
so it can be unpacked in the main CSPSim directory (right
now you have to unpack it in CSPSim/Data)
+
+
+ ////////////////////////////////////////////////////////
+ // SYSTEM CONVERSION
+
+ Bind PhysicsModel and Controller to the bus. --DONE
+
+ Revise AircraftPhysicsModel. --DONE
+
+ Update the XML for AircraftPhysicsModel. --DONE
+
+ Deal with creating FlightDynamics from FlightModel---
+ FlightDynamics should link to FlightModel, not the
+ other way around. --DONE
+
+ Fix aircraft stats --DONE
+
+ Fix landing gear access from AircraftObject --PARTIAL
+ (needs animation overhaul)
+
+ Fix smoke code in AircraftObject
+
+ Use standard channel name defs --PARTIAL
+
+ Improve code in onRender (save old position there, do
+ smoke updates, etc).
+
+ Add gear command handling to gear dynamics --DONE
+
+ share Contact points channel --DONE (sharing ObjectModel)
+
+ registerChannel(Bus::Ref) -> exportChannels --DEFER
+ bind(Bus::Ref) -> importChannels --DONE
+
+ change assertions on missing channels to use library
+ functions, with logging, screen messages, and error
+ modes.
+
+ log missing animation channels --DONE
+
+ rename SystemsModel to ComponentModel or CoreModel?
+
+ rename PhysicsModel::m_qOrientation to m_Attitude --DONE
+
+ dump diagnostics if a dynamics system overflows, then
+ exit.
+
+
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/acinclude.m4,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** acinclude.m4 22 Jul 2003 15:49:41 -0000 1.8
--- acinclude.m4 29 Sep 2003 06:46:10 -0000 1.8.2.1
***************
*** 37,42 ****
dnl Generic version check for libraries using 'xxx-config' scripts
AC_DEFUN(CSP_LIB_CONFIG, [
! lib_min_version=$3
! lib_flags_opt=$4
lib=yes
AC_PATH_PROG($1[]_CONFIG, $2-config, no)
--- 37,42 ----
dnl Generic version check for libraries using 'xxx-config' scripts
AC_DEFUN(CSP_LIB_CONFIG, [
! lib_min_version="$3"
! lib_flags_opt="$4"
lib=yes
AC_PATH_PROG($1[]_CONFIG, $2-config, no)
***************
*** 76,79 ****
--- 76,157 ----
LIBS="$$1[]_LIBS $LIBS"
])
+
+ AC_DEFUN(_CSP_CHECK_PKG_CONFIG, [
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ ])
+
+ dnl Generic version check for libraries using 'pkg-config' scripts
+ AC_DEFUN(_CSP_PKG_CONFIG, [
+ if test "$PKG_CONFIG" != "no"; then
+ CSP_LIB_VERSION=`$PKG_CONFIG --silence-errors --modversion $1`
+ CSP_LIB_LIBS=`$PKG_CONFIG --silence-errors --libs $1`
+ CSP_LIB_CFLAGS=`$PKG_CONFIG --silence-errors --cflags $1`
+ fi
+ ])
+
+ AC_DEFUN(_CSP_LIB_CONFIG, [
+ AC_PATH_PROG(LIB_CONFIG, $1-config, no)
+ if test "$LIB_CONFIG" != "no"; then
+ CSP_LIB_VERSION=`$LIB_CONFIG --version`
+ CSP_LIB_LIBS=`$LIB_CONFIG --libs`
+ CSP_LIB_CFLAGS=`$LIB_CONFIG $2`
+ fi
+ ])
+
+
+ AC_DEFUN(CSP_CONFIG, [
+ lib_name="$1"
+ lib_id="$2"
+ lib_pkg_id="$3"
+ lib_min_version="$4"
+ lib_flags_opt="$5"
+ lib_fullname="$6"
+ lib_site="$7"
+ lib=yes
+ CSP_LIB_VERSION="0.0.0"
+ CSP_LIB_LIBS=""
+ CSP_LIB_CFLAGS=""
+ _CSP_LIB_CONFIG($lib_id, $lib_flags_opt)
+ if test "$CSP_LIB_VERSION" = "0.0.0"; then
+ _CSP_PKG_CONFIG($lib_pkg_id)
+ fi
+ AC_MSG_CHECKING(for $lib_pkg_id >= $lib_min_version)
+ no_lib=""
+ lib_version="$CSP_LIB_VERSION"
+ if test "$lib_version" = "0.0.0"; then
+ no_lib=yes
+ AC_MSG_RESULT(no)
+ else
+ lib_major=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ lib_minor=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ lib_micro=`echo $lib_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ lib_major_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ lib_minor_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ lib_micro_min=`echo $lib_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ lib_version_proper=`expr \
+ $lib_major \> $lib_major_min \| \
+ $lib_major \= $lib_major_min \& \
+ $lib_minor \> $lib_minor_min \| \
+ $lib_major \= $lib_major_min \& \
+ $lib_minor \= $lib_minor_min \& \
+ $lib_micro \>= $lib_micro_min `
+ if test "$lib_version_proper" = "1" ; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ no_lib=yes
+ fi
+ fi
+ if test "$no_lib" = "yes"; then
+ CSP_LIB_ERROR($lib_fullname,$lib_min_version,$lib_site,$1[]_CONFIG)
+ fi
+ $1[]_FLAGS="$CSP_LIB_CFLAGS"
+ $1[]_LIBS="$CSP_LIB_LIBS"
+ AC_SUBST($1[]_FLAGS)
+ AC_SUBST($1[]_LIBS)
+ LIBS="$$1[]_LIBS $LIBS"
+ ])
+
+
Index: configure.in
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/configure.in,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -d -r1.13.2.1 -r1.13.2.2
*** configure.in 16 Sep 2003 06:57:30 -0000 1.13.2.1
--- configure.in 29 Sep 2003 06:46:10 -0000 1.13.2.2
***************
*** 32,35 ****
--- 32,37 ----
AC_ST_BLKSIZE
+ _CSP_CHECK_PKG_CONFIG([])
+
dnl check for Simple Direct Media Library
CSP_LIB_CONFIG([SDL], [sdl], [1.2.5], [--cflags], [Simple Direct Media Library], [http://www.libsdl.org/])
***************
*** 73,77 ****
dnl check for libSigC++ type-safe signal libraryy
! CSP_LIB_CONFIG([SIGC], [sigc], [1.0.1], [--cflags], [LibSigC++ Signal Library], [http://libsigc.sourceforge.net/])
#CSP_LIB_CONFIG([CCGNU2], [ccgnu2], [1.0.6], [--flags], [GNU Common C++ Library], [http://www.gnu.org/software/commonc++/])
--- 75,80 ----
dnl check for libSigC++ type-safe signal libraryy
! dnl CSP_LIB_CONFIG([SIGC], [sigc], [1.0.1], [--cflags], [LibSigC++ Signal Library], [http://libsigc.sourceforge.net/])
! CSP_CONFIG([SIGC], [sigc], [sigc++-1.2], [1.2.0], [--cflags], [LibSigC++ Signal Library], [http://libsigc.sourceforge.net/])
#CSP_LIB_CONFIG([CCGNU2], [ccgnu2], [1.0.6], [--flags], [GNU Common C++ Library], [http://www.gnu.org/software/commonc++/])
|
|
From: <mk...@us...> - 2003-09-29 06:42:15
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftSystems In directory sc8-pr-cvs1:/tmp/cvs-serv25300/AircraftSystems Log Message: Directory /cvsroot/csp/APPLICATIONS/CSPSim/Source/AircraftSystems added to the repository --> Using per-directory sticky tag `systems' |
|
From: <mk...@us...> - 2003-09-27 16:39:05
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003 In directory sc8-pr-cvs1:/tmp/cvs-serv4362 Modified Files: SimData.vcproj Log Message: reverted to 1.1 Index: SimData.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003/SimData.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SimData.vcproj 22 Sep 2003 20:21:35 -0000 1.2 --- SimData.vcproj 27 Sep 2003 16:20:43 -0000 1.3 *************** *** 228,231 **** --- 228,234 ---- </File> <File + RelativePath="..\Source\Pack.cpp"> + </File> + <File RelativePath="..\Source\Path.cpp"> </File> *************** *** 334,337 **** --- 337,343 ---- </File> <File + RelativePath="..\Include\SimData\Pack.h"> + </File> + <File RelativePath="..\Include\SimData\Path.h"> </File> *************** *** 374,378 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> --- 380,384 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> *************** *** 382,386 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> --- 388,392 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> |
|
From: <mk...@us...> - 2003-09-27 16:29:47
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv5589
Modified Files:
Tag: b0_4_0
CHANGES.current
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.75.2.7
retrieving revision 1.75.2.8
diff -C2 -d -r1.75.2.7 -r1.75.2.8
*** CHANGES.current 18 Sep 2003 02:09:48 -0000 1.75.2.7
--- CHANGES.current 27 Sep 2003 16:28:58 -0000 1.75.2.8
***************
*** 1,4 ****
--- 1,8 ----
Version 0.4.0 (in progress)
===========================
+ 2003-09-27: onsight
+ Added the VisualStudio2003 directory from the main trunk,
+ along with Stormbringer's patches to the project file.
+
2003-09-17: onsight
Changed Real::asString() to use std::stringstream instead
|
|
From: <mk...@us...> - 2003-09-27 16:29:17
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003
In directory sc8-pr-cvs1:/tmp/cvs-serv5440
Added Files:
Tag: b0_4_0
SimData.sln SimData.vcproj
Log Message:
--- NEW FILE: SimData.sln ---
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimData", "SimData.vcproj", "{F9948756-70B5-4328-8A6A-F4BE5A521A27}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Debug.ActiveCfg = Debug|Win32
{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Debug.Build.0 = Debug|Win32
{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.ActiveCfg = Release|Win32
{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal
--- NEW FILE: SimData.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="SimData"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory="./Release"
IntermediateDirectory="./Release"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../Include,C:/Python22/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SIMDATA_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
RuntimeTypeInfo="TRUE"
PrecompiledHeaderFile=".\Release/SimData.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile="../SimData/_cSimData.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="C:/Python22/libs"
ProgramDatabaseFile=".\Release/_cSimData.pdb"
ImportLibrary="../SimData/_cSimData.lib"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Release/SimData.tlb"/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy /Y cSimData.py ..\SimData"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1036"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../Include,C:/Python22/include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SIMDATA_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="TRUE"
PrecompiledHeaderFile=".\Debug/SimData.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile="../SimData/_cSimDatad.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="C:/Python22/libs"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/_cSimDatad.pdb"
ImportLibrary="../SimData/_cSimDatad.lib"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Debug/SimData.tlb"/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy /Y cSimData.py ..\SimData"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1036"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath="..\Source\BaseType.cpp">
</File>
<File
RelativePath="..\Source\cSimData_wrap.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="SWIG_GLOBAL"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="SWIG_GLOBAL"/>
</FileConfiguration>
</File>
<File
RelativePath="..\Source\DataArchive.cpp">
</File>
<File
RelativePath="..\Source\DataManager.cpp">
</File>
<File
RelativePath="..\Source\Date.cpp">
</File>
<File
RelativePath="..\Source\Enum.cpp">
</File>
<File
RelativePath="..\Source\Exception.cpp">
</File>
<File
RelativePath="..\Source\External.cpp">
</File>
<File
RelativePath="..\Source\FileUtility.cpp">
</File>
<File
RelativePath="..\Source\GeoPos.cpp">
</File>
<File
RelativePath="..\Source\HashUtility.cpp">
</File>
<File
RelativePath="..\Source\InterfaceRegistry.cpp">
</File>
<File
RelativePath="..\Source\Interpolate.cpp">
</File>
<File
RelativePath="..\Source\Key.cpp">
</File>
<File
RelativePath="..\Source\Link.cpp">
</File>
<File
RelativePath="..\Source\List.cpp">
</File>
<File
RelativePath="..\Source\LogStream.cpp">
</File>
<File
RelativePath="..\Source\LUT.cpp">
</File>
<File
RelativePath="..\Source\Math.cpp">
</File>
<File
RelativePath="..\Source\Matrix3.cpp">
</File>
<File
RelativePath="..\Source\Noise.cpp">
</File>
<File
RelativePath="..\Source\Object.cpp">
</File>
<File
RelativePath="..\Source\Path.cpp">
</File>
<File
RelativePath="..\Source\Quat.cpp">
</File>
<File
RelativePath="..\Source\Random.cpp">
</File>
<File
RelativePath="..\Source\Real.cpp">
</File>
<File
RelativePath="..\Source\TypeAdapter.cpp">
</File>
<File
RelativePath="..\Source\Vector3.cpp">
</File>
<File
RelativePath="..\Source\Version.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath="..\Include\SimData\BaseType.h">
</File>
<File
RelativePath="..\Include\SimData\Conversions.h">
</File>
<File
RelativePath="..\Include\SimData\DataArchive.h">
</File>
<File
RelativePath="..\Include\SimData\Date.h">
</File>
<File
RelativePath="..\Include\SimData\Enum.h">
</File>
<File
RelativePath="..\Include\SimData\Exception.h">
</File>
<File
RelativePath="..\Include\SimData\Export.h">
</File>
<File
RelativePath="..\Include\SimData\External.h">
</File>
<File
RelativePath="..\Include\SimData\GeoPos.h">
</File>
<File
RelativePath="..\Include\SimData\GlibCsp.h">
</File>
<File
RelativePath="..\Include\SimData\hash_map.h">
</File>
<File
RelativePath="..\Include\SimData\HashUtility.h">
</File>
<File
RelativePath="..\Include\SimData\Integer.h">
</File>
<File
RelativePath="..\Include\SimData\InterfaceRegistry.h">
</File>
<File
RelativePath="..\Include\SimData\InterfaceRegistry_wrap.h">
</File>
<File
RelativePath="..\Include\SimData\Interpolate.h">
</File>
<File
RelativePath="..\Include\SimData\Key.h">
</File>
<File
RelativePath="..\Include\SimData\Link.h">
</File>
<File
RelativePath="..\Include\SimData\List.h">
</File>
<File
RelativePath="..\Include\SimData\Log.h">
</File>
<File
RelativePath="..\Include\SimData\LogStream.h">
</File>
<File
RelativePath="..\Include\SimData\LUT.h">
</File>
<File
RelativePath="..\Include\SimData\Math.h">
</File>
<File
RelativePath="..\Include\SimData\Matrix3.h">
</File>
<File
RelativePath="..\Include\SimData\ns-simdata.h">
</File>
<File
RelativePath="..\Include\SimData\Object.h">
</File>
<File
RelativePath="..\Include\SimData\ObjectInterface.h">
</File>
<File
RelativePath="..\Include\SimData\Path.h">
</File>
<File
RelativePath="..\Include\SimData\Quat.h">
</File>
<File
RelativePath="..\Include\SimData\Random.h">
</File>
<File
RelativePath="..\Include\SimData\Real.h">
</File>
<File
RelativePath="..\Include\SimData\Ref.h">
</File>
<File
RelativePath="..\Include\SimData\String.h">
</File>
<File
RelativePath="..\Include\SimData\TypeAdapter.h">
</File>
<File
RelativePath="..\Include\SimData\Types.h">
</File>
<File
RelativePath="..\Include\SimData\Vector3.h">
</File>
<File
RelativePath="..\Include\SimData\Vector3.inl">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
</Filter>
<File
RelativePath="..\Source\cSimData.i">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i
"
Outputs="..\Source\$(InputName)_wrap.cpp"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i
"
Outputs="..\Source\$(InputName)_wrap.cpp"/>
</FileConfiguration>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
|
|
From: <sto...@us...> - 2003-09-22 20:21:45
|
Update of /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003 In directory sc8-pr-cvs1:/tmp/cvs-serv18527 Modified Files: SimData.vcproj Log Message: removed pack.h/.cpp Index: SimData.vcproj =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/VisualStudio2003/SimData.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimData.vcproj 10 Aug 2003 18:34:15 -0000 1.1 --- SimData.vcproj 22 Sep 2003 20:21:35 -0000 1.2 *************** *** 228,234 **** </File> <File - RelativePath="..\Source\Pack.cpp"> - </File> - <File RelativePath="..\Source\Path.cpp"> </File> --- 228,231 ---- *************** *** 337,343 **** </File> <File - RelativePath="..\Include\SimData\Pack.h"> - </File> - <File RelativePath="..\Include\SimData\Path.h"> </File> --- 334,337 ---- *************** *** 380,384 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> --- 374,378 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> *************** *** 388,392 **** <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.19\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> --- 382,386 ---- <Tool Name="VCCustomBuildTool" ! CommandLine="C:\progra~1\SWIG-1.3.16\swig -c++ -python -noexcept -D__NO_LUT__ -DWIN32 -I..\Include -o ..\Source\$(InputName)_wrap.cpp ..\Source\$(InputName).i " Outputs="..\Source\$(InputName)_wrap.cpp"/> |
Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv7999/Source
Modified Files:
Tag: b0_4_0
DataArchive.cpp Date.cpp GeoPos.cpp Interpolate.cpp LUT.cpp
Matrix3.cpp Quat.cpp
Log Message:
Index: DataArchive.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/DataArchive.cpp,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -C2 -d -r1.15.2.2 -r1.15.2.3
*** DataArchive.cpp 18 Sep 2003 00:27:38 -0000 1.15.2.2
--- DataArchive.cpp 18 Sep 2003 02:09:49 -0000 1.15.2.3
***************
*** 131,142 ****
while (n_directories-- > 0) {
ObjectID node = *hptr++;
! uint32 n = hptr->a;
++hptr;
! if (n > n_paths) {
throw CorruptArchive("Path table of contents.");
}
std::vector<ObjectID> &childlist = _children[node];
! childlist.reserve(n);
! while (n-- > 0) {
childlist.push_back(*hptr++);
}
--- 131,142 ----
while (n_directories-- > 0) {
ObjectID node = *hptr++;
! uint32 n_children = hptr->a;
++hptr;
! if (n_children > n_paths) {
throw CorruptArchive("Path table of contents.");
}
std::vector<ObjectID> &childlist = _children[node];
! childlist.reserve(n_children);
! while (n_children-- > 0) {
childlist.push_back(*hptr++);
}
***************
*** 181,187 ****
fwrite(&size, sizeof(size), 1, _f);
for (iter = _children.begin(); iter != _children.end(); iter++) {
! ObjectID size = iter->second.size();
fwrite(&(iter->first), sizeof(ObjectID), 1, _f);
! fwrite(&size, sizeof(size), 1, _f);
std::vector<ObjectID>::const_iterator child = iter->second.begin();
std::vector<ObjectID>::const_iterator last_child = iter->second.end();
--- 181,187 ----
fwrite(&size, sizeof(size), 1, _f);
for (iter = _children.begin(); iter != _children.end(); iter++) {
! ObjectID n_children = iter->second.size();
fwrite(&(iter->first), sizeof(ObjectID), 1, _f);
! fwrite(&n_children, sizeof(n_children), 1, _f);
std::vector<ObjectID>::const_iterator child = iter->second.begin();
std::vector<ObjectID>::const_iterator last_child = iter->second.end();
Index: Date.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Date.cpp,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -C2 -d -r1.7.2.5 -r1.7.2.6
*** Date.cpp 18 Sep 2003 00:32:06 -0000 1.7.2.5
--- Date.cpp 18 Sep 2003 02:09:49 -0000 1.7.2.6
***************
*** 97,103 ****
timing_t get_realtime() {
! struct timezone tz;
struct timeval now;
! gettimeofday(&now, &tz);
return (timing_t) ((double)now.tv_sec + (double)now.tv_usec*1.0e-6);
}
--- 97,103 ----
timing_t get_realtime() {
! struct timezone tz_;
struct timeval now;
! gettimeofday(&now, &tz_);
return (timing_t) ((double)now.tv_sec + (double)now.tv_usec*1.0e-6);
}
Index: GeoPos.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/GeoPos.cpp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -d -r1.7.2.1 -r1.7.2.2
*** GeoPos.cpp 22 Aug 2003 00:21:45 -0000 1.7.2.1
--- GeoPos.cpp 18 Sep 2003 02:09:49 -0000 1.7.2.2
***************
*** 68,73 ****
y_ = _ref.A_B * (y_ + dz);
x_ = x_ + dp;
! double h = 1.0 / sqrt(y_*y_ + x_*x_);
! _iterateECEF(_lat, _alt, p, z_, x_*h, y_*h, z, _ref, iter+1);
}
}
--- 68,73 ----
y_ = _ref.A_B * (y_ + dz);
x_ = x_ + dp;
! double hp = 1.0 / sqrt(y_*y_ + x_*x_);
! _iterateECEF(_lat, _alt, p, z_, x_*hp, y_*hp, z, _ref, iter+1);
}
}
***************
*** 566,570 ****
double nu, T, T2, S, C, CP, SP, R, D, D2, M;
double mu, phi;
! double x, y;
_easting = easting;
--- 566,570 ----
double nu, T, T2, S, C, CP, SP, R, D, D2, M;
double mu, phi;
! double x_, y_;
_easting = easting;
***************
*** 573,586 ****
_designator = designator;
! x = easting - 500000.0; //remove 500,000 meter offset for longitude
! y = northing;
if ((designator - 'N') < 0) {
! y -= 10000000.0; //remove 10,000,000 meter offset used for southern hemisphere
}
double lon0 = toRadians((getZoneNumber() - 1) * 6.0 - 180.0 + 3.0); //+3 puts origin in middle of zone
! M = y / k0;
mu = M * _ref->m_f;
--- 573,586 ----
_designator = designator;
! x_ = easting - 500000.0; //remove 500,000 meter offset for longitude
! y_ = northing;
if ((designator - 'N') < 0) {
! y_ -= 10000000.0; //remove 10,000,000 meter offset used for southern hemisphere
}
double lon0 = toRadians((getZoneNumber() - 1) * 6.0 - 180.0 + 3.0); //+3 puts origin in middle of zone
! M = y_ / k0;
mu = M * _ref->m_f;
***************
*** 596,600 ****
SP = 1.0 - S * S * _ref->e2;
R = _ref->A * _ref->B2_A2 / (SP*sqrt(SP));
! D = x/(nu*k0);
D2 = D*D;
--- 596,600 ----
SP = 1.0 - S * S * _ref->e2;
R = _ref->A * _ref->B2_A2 / (SP*sqrt(SP));
! D = x_/(nu*k0);
D2 = D*D;
***************
*** 797,802 ****
y_ = _ref->A_B * (y_ + dz);
x_ = x_ + dp;
! double h = 1.0 / sqrt(y_*y_ + x_*x_);
! iterateECEF(p, z_, x_*h, y_*h, iter+1);
}
}
--- 797,802 ----
y_ = _ref->A_B * (y_ + dz);
x_ = x_ + dp;
! double hp = 1.0 / sqrt(y_*y_ + x_*x_);
! iterateECEF(p, z_, x_*hp, y_*hp, iter+1);
}
}
***************
*** 835,840 ****
// UTM
! UTM::UTM(LLA const &lla, ReferenceEllipsoid const &ref, char zone) {
! *this = LLAtoUTM(lla, ref, zone);
}
--- 835,840 ----
// UTM
! UTM::UTM(LLA const &lla, ReferenceEllipsoid const &ref, char zone_) {
! *this = LLAtoUTM(lla, ref, zone_);
}
***************
*** 867,881 ****
}
! void UTM::set(double easting, double northing, const char *code, double alt)
{
_zone=0;
_designator='Z';
! _E = easting;
! _N = northing;
_alt = alt;
! if (code) {
! char c0 = code[0];
! char c1 = code[1];
! char c2 = code[2];
_zone = c0 - '0';
if (c2) {
--- 867,881 ----
}
! void UTM::set(double easting_, double northing_, const char *zone_, double alt)
{
_zone=0;
_designator='Z';
! _E = easting_;
! _N = northing_;
_alt = alt;
! if (zone_) {
! char c0 = zone_[0];
! char c1 = zone_[1];
! char c2 = zone_[2];
_zone = c0 - '0';
if (c2) {
***************
*** 915,924 ****
const char *c = cdata;
while (*c != 0 && (*c == ' ' || *c == '\t' || *c == '\r' || *c == '\n')) c++;
! int zone;
! char designator;
! int n = sscanf(c, "%lf %lf %d%c %lf", &_E, &_N, &zone, &designator, &_alt);
if (n != 5) throw ParseException("SYNTAX ERROR: expecting 'easting northing zone altitude'");
! _zone = zone;
! _designator = toupper(designator);
if (!valid()) {
throw ParseException("SYNTAX ERROR: invalid UTM code");
--- 915,924 ----
const char *c = cdata;
while (*c != 0 && (*c == ' ' || *c == '\t' || *c == '\r' || *c == '\n')) c++;
! int zone_;
! char designator_;
! int n = sscanf(c, "%lf %lf %d%c %lf", &_E, &_N, &zone_, &designator_, &_alt);
if (n != 5) throw ParseException("SYNTAX ERROR: expecting 'easting northing zone altitude'");
! _zone = zone_;
! _designator = toupper(designator_);
if (!valid()) {
throw ParseException("SYNTAX ERROR: invalid UTM code");
Index: Interpolate.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Interpolate.cpp,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -C2 -d -r1.17.2.1 -r1.17.2.2
*** Interpolate.cpp 22 Aug 2003 00:21:45 -0000 1.17.2.1
--- Interpolate.cpp 18 Sep 2003 02:09:49 -0000 1.17.2.2
***************
*** 159,163 ****
_min = _breaks[0];
double max = _breaks[n-1];
! value_t _range = static_cast<value_t>(max - _min);
_i_n = int(_range / spacing) + 1;
_table.resize(_i_n);
--- 159,163 ----
_min = _breaks[0];
double max = _breaks[n-1];
! _range = static_cast<value_t>(max - _min);
_i_n = int(_range / spacing) + 1;
_table.resize(_i_n);
Index: LUT.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/LUT.cpp,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -d -r1.5.2.2 -r1.5.2.3
*** LUT.cpp 18 Sep 2003 00:32:06 -0000 1.5.2.2
--- LUT.cpp 18 Sep 2003 02:09:49 -0000 1.5.2.3
***************
*** 549,553 ****
X h = xb - xa;
X s = static_cast<X>(1.0) / h;
! X d2s = h * h * 0.166666667;
for (int i = 0; i < n; ++i) {
X x = x0 + i * dx;
--- 549,553 ----
X h = xb - xa;
X s = static_cast<X>(1.0) / h;
! X d2s = h * h * static_cast<X>(0.166666667);
for (int i = 0; i < n; ++i) {
X x = x0 + i * dx;
***************
*** 560,564 ****
h = xb - xa;
s = static_cast<X>(1.0) / h;
! d2s = h * h * 0.166666667;
}
X f = (x - xa) * s;
--- 560,564 ----
h = xb - xa;
s = static_cast<X>(1.0) / h;
! d2s = h * h * static_cast<X>(0.166666667);
}
X f = (x - xa) * s;
Index: Matrix3.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Matrix3.cpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** Matrix3.cpp 22 Aug 2003 00:21:45 -0000 1.9.2.1
--- Matrix3.cpp 18 Sep 2003 02:09:49 -0000 1.9.2.2
***************
*** 110,120 ****
void Matrix3::preMult(const Matrix3& other) {
double t[3];
! for (int col=0; col<3; col++) {
! t[0] = INNER_PRODUCT(other, *this, 0, col);
! t[1] = INNER_PRODUCT(other, *this, 1, col);
! t[2] = INNER_PRODUCT(other, *this, 2, col);
! _mat[0][col] = t[0];
! _mat[1][col] = t[1];
! _mat[2][col] = t[2];
}
}
--- 110,120 ----
void Matrix3::preMult(const Matrix3& other) {
double t[3];
! for (int col_=0; col_<3; col_++) {
! t[0] = INNER_PRODUCT(other, *this, 0, col_);
! t[1] = INNER_PRODUCT(other, *this, 1, col_);
! t[2] = INNER_PRODUCT(other, *this, 2, col_);
! _mat[0][col_] = t[0];
! _mat[1][col_] = t[1];
! _mat[2][col_] = t[2];
}
}
***************
*** 122,132 ****
void Matrix3::postMult(const Matrix3& other) {
double t[3];
! for (int row=0; row<3; row++) {
! t[0] = INNER_PRODUCT(*this, other, row, 0);
! t[1] = INNER_PRODUCT(*this, other, row, 1);
! t[2] = INNER_PRODUCT(*this, other, row, 2);
! _mat[row][0] = t[0];
! _mat[row][1] = t[1];
! _mat[row][2] = t[2];
}
}
--- 122,132 ----
void Matrix3::postMult(const Matrix3& other) {
double t[3];
! for (int row_=0; row_<3; row_++) {
! t[0] = INNER_PRODUCT(*this, other, row_, 0);
! t[1] = INNER_PRODUCT(*this, other, row_, 1);
! t[2] = INNER_PRODUCT(*this, other, row_, 2);
! _mat[row_][0] = t[0];
! _mat[row_][1] = t[1];
! _mat[row_][2] = t[2];
}
}
Index: Quat.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Quat.cpp,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** Quat.cpp 22 Aug 2003 00:21:45 -0000 1.3.2.1
--- Quat.cpp 18 Sep 2003 02:09:49 -0000 1.3.2.2
***************
*** 91,103 ****
/// Set the elements of the Quat to represent a rotation of angle
/// (radians) around the axis (x,y,z)
! void Quat::makeRotate(double angle, double x, double y, double z)
{
! double inversenorm = 1.0/sqrt(x*x + y*y + z*z);
double coshalfangle = cos(0.5*angle);
double sinhalfangle = sin(0.5*angle);
! _x = x * sinhalfangle * inversenorm;
! _y = y * sinhalfangle * inversenorm;
! _z = z * sinhalfangle * inversenorm;
_w = coshalfangle;
}
--- 91,103 ----
/// Set the elements of the Quat to represent a rotation of angle
/// (radians) around the axis (x,y,z)
! void Quat::makeRotate(double angle, double x_, double y_, double z_)
{
! double inversenorm = 1.0/sqrt(x_*x_ + y_*y_ + z_*z_);
double coshalfangle = cos(0.5*angle);
double sinhalfangle = sin(0.5*angle);
! _x = x_ * sinhalfangle * inversenorm;
! _y = y_ * sinhalfangle * inversenorm;
! _z = z_ * sinhalfangle * inversenorm;
_w = coshalfangle;
}
***************
*** 128,136 ****
const double epsilon = 0.00001f;
- double length1 = from.length();
- double length2 = to.length();
-
// dot product vec1*vec2
! double cosangle = (from*to)/(length1*length2);
if (fabs(cosangle - 1) < epsilon) {
--- 128,133 ----
const double epsilon = 0.00001f;
// dot product vec1*vec2
! double cosangle = (from*to)/(from.length()*to.length());
if (fabs(cosangle - 1) < epsilon) {
***************
*** 203,217 ****
// Won't give very meaningful results if the Quat is not associated
// with a rotation!
! void Quat::getRotate(double& angle, double& x, double& y, double& z) const {
double sinhalfangle = sqrt(_x*_x + _y*_y + _z*_z);
angle = 2 * atan2(sinhalfangle, _w);
if(sinhalfangle) {
! x = _x / sinhalfangle;
! y = _y / sinhalfangle;
! z = _z / sinhalfangle;
} else {
! x = 0.0;
! y = 0.0;
! z = 1.0;
}
}
--- 200,214 ----
// Won't give very meaningful results if the Quat is not associated
// with a rotation!
! void Quat::getRotate(double& angle, double& x_, double& y_, double& z_) const {
double sinhalfangle = sqrt(_x*_x + _y*_y + _z*_z);
angle = 2 * atan2(sinhalfangle, _w);
if(sinhalfangle) {
! x_ = _x / sinhalfangle;
! y_ = _y / sinhalfangle;
! z_ = _z / sinhalfangle;
} else {
! x_ = 0.0;
! y_ = 0.0;
! z_ = 1.0;
}
}
|
|
From: <mk...@us...> - 2003-09-18 02:09:53
|
Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv7999
Modified Files:
Tag: b0_4_0
CHANGES.current Makefile
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.75.2.6
retrieving revision 1.75.2.7
diff -C2 -d -r1.75.2.6 -r1.75.2.7
*** CHANGES.current 18 Sep 2003 00:27:37 -0000 1.75.2.6
--- CHANGES.current 18 Sep 2003 02:09:48 -0000 1.75.2.7
***************
*** 11,14 ****
--- 11,25 ----
Date.cpp.
+ Fixed numerous double->float conversions (mostly in LUT.cpp).
+
+ Fixed numerous shadowed variables/methods in Quat, Matrix,
+ Vector, UTM, GeoPos, and others.
+
+ Added additional warning flags for g++.
+
+ ==========> NOTE changes to the ObjectInterface templates trigger a
+ regression in swig 1.3.19. Use either 1.3.16 or the most
+ recent cvs (pre 1.3.20).
+
==========> NOTE that Quaternion.h/cpp are now Quat.h/cpp
Index: Makefile
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Makefile,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -d -r1.20 -r1.20.2.1
*** Makefile 16 Aug 2003 07:56:39 -0000 1.20
--- Makefile 18 Sep 2003 02:09:48 -0000 1.20.2.1
***************
*** 3,12 ****
export PYTHON_INCLUDE := $(shell python setup.py python_include_path)
! export GDEBUGF = -g -W -Wall -Werror -pedantic #-DSIMDATA_NOLOADCHECK
export GCFLAGS = -fPIC -O2 # -march=athlon-tbird
export GLDOPTS = -shared -lswigpy -ldl
export GSWOPTS = -c -c++ -python -noexcept
! export CXX = g++ #-3.3
! export SWIG = swig
.PHONY: all clean clean-deps
--- 3,12 ----
export PYTHON_INCLUDE := $(shell python setup.py python_include_path)
! export GDEBUGF = -g -W -Wall -Werror -pedantic -Wmissing-prototypes -Wconversion -Wshadow #-DSIMDATA_NOLOADCHECK
export GCFLAGS = -fPIC -O2 # -march=athlon-tbird
export GLDOPTS = -shared -lswigpy -ldl
export GSWOPTS = -c -c++ -python -noexcept
! export CXX = g++-3.3
! export SWIG = swig
.PHONY: all clean clean-deps
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv7999/Include/SimData
Modified Files:
Tag: b0_4_0
GeoPos.h LogStream.h Matrix3.h Quat.h TypeAdapter.h Vector3.h
Log Message:
Index: GeoPos.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/GeoPos.h,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -d -r1.10.2.1 -r1.10.2.2
*** GeoPos.h 22 Aug 2003 00:21:45 -0000 1.10.2.1
--- GeoPos.h 18 Sep 2003 02:09:48 -0000 1.10.2.2
***************
*** 621,626 ****
/** Construct a UTM.
*/
! UTM(double easting, double northing, char zone, char designator, double alt=0.0) {
! set(easting, northing, zone, designator, alt);
}
--- 621,626 ----
/** Construct a UTM.
*/
! UTM(double easting_, double northing_, char zone_, char designator_, double alt=0.0) {
! set(easting_, northing_, zone_, designator_, alt);
}
***************
*** 645,659 ****
/** Set the current position from UTM coordinates.
*
! * @param easting UTM easting
! * @param northing UTM northing
! * @param zone UTM zone
! * @param designator UTM zone letter
! * @param alt altitude above the reference ellipse (in meters)
*/
! void set(double easting, double northing, char zone, char designator, double alt=0.0) {
! _E = easting;
! _N = northing;
! _zone = zone;
! _designator = designator;
_alt = alt;
// XXX check values
--- 645,660 ----
/** Set the current position from UTM coordinates.
*
! * @param easting_ UTM easting
! * @param northing_ UTM northing
! * @param zone_ UTM zone
! * @param designator_ UTM zone letter
! * @param alt_ altitude above the reference ellipse (in meters)
*/
! void set(double easting_, double northing_,
! char zone_, char designator_, double alt=0.0) {
! _E = easting_;
! _N = northing_;
! _zone = zone_;
! _designator = designator_;
_alt = alt;
// XXX check values
***************
*** 662,671 ****
/** Set the current position from UTM coordinates.
*
! * @param easting UTM easting
! * @param northing UTM northing
! * @param zone UTM zone (e.g. "10T")
! * @param alt altitude above the reference ellipse (in meters)
*/
! void set(double easting, double northing, const char *zone, double alt = 0.0);
/** Get the easting coordinate.
--- 663,672 ----
/** Set the current position from UTM coordinates.
*
! * @param easting_ UTM easting
! * @param northing_ UTM northing
! * @param zone_ UTM zone (e.g. "10T")
! * @param alt_ altitude above the reference ellipse (in meters)
*/
! void set(double easting_, double northing_, const char *zone_, double alt = 0.0);
/** Get the easting coordinate.
***************
*** 732,736 ****
/** Construct a new ECEF
*/
! ECEF(double x, double y, double z): Vector3(x, y, z) {}
/** Copy constructor to convert from UTM
--- 733,737 ----
/** Construct a new ECEF
*/
! ECEF(double x_, double y_, double z_): Vector3(x_, y_, z_) {}
/** Copy constructor to convert from UTM
Index: LogStream.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LogStream.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** LogStream.h 15 Aug 2003 01:17:06 -0000 1.9
--- LogStream.h 18 Sep 2003 02:09:48 -0000 1.9.2.1
***************
*** 210,219 ****
* @param out output stream
*/
! logstream( std::ostream& out )
: logstream_base(),
ostream(&lbuf), // msvc6 accepts ostream(&lbuf) _using std::ostream_, but not std::ostream(&lbuf) ...
m_out(NULL)
{
! lbuf.set_sb(out.rdbuf());
}
--- 210,219 ----
* @param out output stream
*/
! logstream(std::ostream& out_)
: logstream_base(),
ostream(&lbuf), // msvc6 accepts ostream(&lbuf) _using std::ostream_, but not std::ostream(&lbuf) ...
m_out(NULL)
{
! lbuf.set_sb(out_.rdbuf());
}
***************
*** 234,240 ****
* @param out output stream
*/
! void setOutput( std::ostream& out ) {
_close();
! lbuf.set_sb( out.rdbuf() );
}
--- 234,240 ----
* @param out output stream
*/
! void setOutput(std::ostream& out_) {
_close();
! lbuf.set_sb(out_.rdbuf() );
}
Index: Matrix3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Matrix3.h,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** Matrix3.h 22 Aug 2003 00:21:45 -0000 1.14.2.1
--- Matrix3.h 18 Sep 2003 02:09:48 -0000 1.14.2.2
***************
*** 142,159 ****
/** Get the value (reference) of a matrix element.
*/
! inline double& operator()(int row, int col) { return _mat[row][col]; }
/** Get the (const) value of a matrix element.
*/
! inline double operator()(int row, int col) const { return _mat[row][col]; }
#endif // SWIG
/** Get the value of a matrix element.
*/
! inline double getElement(int row, int col) { return _mat[row][col]; }
/** Set the value of a matrix element.
*/
! inline void setElement(int row, int col, double value) { _mat[row][col]=value; }
/** Return true if all elements are valid floating point numbers.
--- 142,159 ----
/** Get the value (reference) of a matrix element.
*/
! inline double& operator()(int row_, int col_) { return _mat[row_][col_]; }
/** Get the (const) value of a matrix element.
*/
! inline double operator()(int row_, int col_) const { return _mat[row_][col_]; }
#endif // SWIG
/** Get the value of a matrix element.
*/
! inline double getElement(int row_, int col_) { return _mat[row_][col_]; }
/** Set the value of a matrix element.
*/
! inline void setElement(int row_, int col_, double value) { _mat[row_][col_]=value; }
/** Return true if all elements are valid floating point numbers.
***************
*** 183,188 ****
/** Set this matrix from a double[9] array.
*/
! inline void set(double const * const ptr) {
! std::copy(ptr, ptr+9, (double*)(_mat));
}
--- 183,188 ----
/** Set this matrix from a double[9] array.
*/
! inline void set(double const * const ptr_) {
! std::copy(ptr_, ptr_+9, (double*)(_mat));
}
Index: Quat.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Quat.h,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** Quat.h 22 Aug 2003 00:21:45 -0000 1.8.2.1
--- Quat.h 18 Sep 2003 02:09:48 -0000 1.8.2.2
***************
*** 99,103 ****
* Specifiy the four real-valued components.
*/
! inline Quat(double x, double y, double z, double w): _x(x), _y(y), _z(z), _w(w) {}
/** Construct a new quaternion representing a rotation.
--- 99,106 ----
* Specifiy the four real-valued components.
*/
! inline Quat(double x_, double y_, double z_, double w_):
! _x(x_), _y(y_), _z(z_), _w(w_)
! {
! }
/** Construct a new quaternion representing a rotation.
***************
*** 138,143 ****
/** Set the components.
*/
! inline void set(double x, double y, double z, double w) {
! _x = x; _y = y; _z = z; _w = w;
}
--- 141,146 ----
/** Set the components.
*/
! inline void set(double x_, double y_, double z_, double w_) {
! _x = x_; _y = y_; _z = z_; _w = w_;
}
***************
*** 228,238 ****
/// Unary multiply --- adjusted relative to osg for active transformations!
inline Quat& operator*=(const Quat& rhs) {
! double x = rhs._w*_x + rhs._x*_w - rhs._y*_z + rhs._z*_y;
! double y = rhs._w*_y + rhs._x*_z + rhs._y*_w - rhs._z*_x;
! double z = rhs._w*_z - rhs._x*_y + rhs._y*_x + rhs._z*_w;
_w = rhs._w*_w - rhs._x*_x - rhs._y*_y - rhs._z*_z;
! _z = z;
! _y = y;
! _x = x;
return *this;
}
--- 231,241 ----
/// Unary multiply --- adjusted relative to osg for active transformations!
inline Quat& operator*=(const Quat& rhs) {
! double x_ = rhs._w*_x + rhs._x*_w - rhs._y*_z + rhs._z*_y;
! double y_ = rhs._w*_y + rhs._x*_z + rhs._y*_w - rhs._z*_x;
! double z_ = rhs._w*_z - rhs._x*_y + rhs._y*_x + rhs._z*_w;
_w = rhs._w*_w - rhs._x*_x - rhs._y*_y - rhs._z*_z;
! _z = z_;
! _y = y_;
! _x = x_;
return *this;
}
Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** TypeAdapter.h 20 Aug 2003 02:47:10 -0000 1.22
--- TypeAdapter.h 18 Sep 2003 02:09:48 -0000 1.22.2.1
***************
*** 212,218 ****
} else {
// last chance, is it a path?
! Path const *p = dynamic_cast<Path const *>(var.o);
! TypeCheck(p!=NULL, "dynamic cast of BaseType* to LinkBase failed");
! x = LinkBase(*(const_cast<Path *>(p)), 0);
}
}
--- 212,218 ----
} else {
// last chance, is it a path?
! Path const *path = dynamic_cast<Path const *>(var.o);
! TypeCheck(path!=NULL, "dynamic cast of BaseType* to LinkBase failed");
! x = LinkBase(*(const_cast<Path *>(path)), 0);
}
}
Index: Vector3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Vector3.h,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -d -r1.16.2.1 -r1.16.2.2
*** Vector3.h 22 Aug 2003 00:21:45 -0000 1.16.2.1
--- Vector3.h 18 Sep 2003 02:09:48 -0000 1.16.2.2
***************
*** 78,82 ****
Vector3(): _x(0.0), _y(0.0), _z(0.0) {}
/// Construct and initialize a new vector.
! Vector3(double x, double y, double z): _x(x), _y(y), _z(z) {}
/// Copy constructor.
Vector3(const Vector3& v): BaseType(v), _x(v._x), _y(v._y), _z(v._z) {}
--- 78,82 ----
Vector3(): _x(0.0), _y(0.0), _z(0.0) {}
/// Construct and initialize a new vector.
! Vector3(double x_, double y_, double z_): _x(x_), _y(y_), _z(z_) {}
/// Copy constructor.
Vector3(const Vector3& v): BaseType(v), _x(v._x), _y(v._y), _z(v._z) {}
***************
*** 97,101 ****
/// Set the vector components.
! inline void set(double x, double y, double z) { _x=x; _y=y; _z=z; }
#ifndef SWIG
--- 97,101 ----
/// Set the vector components.
! inline void set(double x_, double y_, double z_) { _x=x_; _y=y_; _z=z_; }
#ifndef SWIG
|
