[simspark-cvs] simspark/spark/oxygen Makefile.am,NONE,1.1 oxygen.cpp,NONE,1.1 oxygen.h,NONE,1.1

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14301

Added Files:
	Makefile.am oxygen.cpp oxygen.h 
Log Message:


--- NEW FILE: oxygen.h ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: oxygen.h,v 1.1 2005/12/05 21:16:49 rollmark Exp $

   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; version 2 of the License.

   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., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef OXYGEN_OXYGEN_H
#define OXYGEN_OXYGEN_H

#include "agentaspect/agentaspect.h"
#include "agentaspect/effector.h"
#include "agentaspect/perceptor.h"

#include "controlaspect/controlaspect.h"

#include "gamecontrolserver/baseparser.h"
#include "gamecontrolserver/gamecontrolserver.h"
#include "gamecontrolserver/actionobject.h"

#include "physicsserver/body.h"
#include "physicsserver/bodycontroller.h"
#include "physicsserver/dragcontroller.h"
#include "physicsserver/velocitycontroller.h"
#include "physicsserver/boxcollider.h"
#include "physicsserver/ccylindercollider.h"
#include "physicsserver/collider.h"
#include "physicsserver/odeobject.h"
#include "physicsserver/physicsserver.h"
#include "physicsserver/planecollider.h"
#include "physicsserver/raycollider.h"
#include "physicsserver/space.h"
#include "physicsserver/spherecollider.h"
#include "physicsserver/world.h"
#include "physicsserver/collisionhandler.h"
#include "physicsserver/contactjointhandler.h"
#include "physicsserver/recorderhandler.h"
#include "physicsserver/joint.h"
#include "physicsserver/balljoint.h"
#include "physicsserver/hingejoint.h"
#include "physicsserver/fixedjoint.h"
#include "physicsserver/sliderjoint.h"
#include "physicsserver/universaljoint.h"
#include "physicsserver/hinge2joint.h"

#include "sceneserver/basenode.h"
#include "sceneserver/camera.h"
#include "sceneserver/fpscontroller.h"
#include "sceneserver/scene.h"
#include "sceneserver/sceneserver.h"
#include "sceneserver/transform.h"
#include "sceneserver/sceneimporter.h"

#include "simulationserver/simulationserver.h"
#include "simulationserver/simcontrolnode.h"
#include "simulationserver/netcontrol.h"
#include "simulationserver/netmessage.h"
#include "simulationserver/agentcontrol.h"
#include "simulationserver/monitorcontrol.h"

#include "geometryserver/geometryserver.h"
#include "geometryserver/meshimporter.h"
#include "geometryserver/stdmeshimporter.h"

#ifdef HAVE_SPADES_HEADERS
#include "spadesserver/spadesserver.h"
#include "spadesserver/paramreader.h"
#endif

#include "monitorserver/monitorserver.h"
#include "monitorserver/monitorsystem.h"
#include "monitorserver/custommonitor.h"
#include "monitorserver/monitoritem.h"
#include "monitorserver/monitorcmdparser.h"

// control aspect
#include <zeitgeist/zeitgeist.h>

namespace oxygen
{

/** This is the main class, which initializes the Oxygen framework. It
     registers all internal classes.
*/
class Oxygen
{
public:
    /** initializes the oxygen framework \param zg is a reference to
        an already initialized zeitgeist framework in which the
        internal oxygen libraries get installed
    */
    Oxygen(zeitgeist::Zeitgeist& zg);
    virtual ~Oxygen() {}

private:
    Oxygen(const Oxygen& obj);
    Oxygen& operator=(const Oxygen& obj);

};

} //namespace oxygen


#endif // OXYGEN_OXYGEN_H

--- NEW FILE: oxygen.cpp ---
/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-

   this file is part of rcssserver3D
   Fri May 9 2003
   Copyright (C) 2002,2003 Koblenz University
   Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
   $Id: oxygen.cpp,v 1.1 2005/12/05 21:16:49 rollmark Exp $

   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; version 2 of the License.

   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., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "oxygen.h"

using namespace oxygen;
using namespace zeitgeist;

Oxygen::Oxygen(zeitgeist::Zeitgeist& zg)
{
    // scene graph
    zg.GetCore()->RegisterClassObject(new CLASS(SceneServer), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(BaseNode), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(Camera), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(FPSController), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(Scene), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(Transform), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(SceneImporter), "oxygen/");

    // simulation
    zg.GetCore()->RegisterClassObject(new CLASS(SimulationServer), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(SimControlNode), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(NetControl), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(NetMessage), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(AgentControl), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(MonitorControl), "oxygen/");

    // geometry
    zg.GetCore()->RegisterClassObject(new CLASS(GeometryServer), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(MeshImporter), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(StdMeshImporter), "oxygen/");

    // physics
    zg.GetCore()->RegisterClassObject(new CLASS(PhysicsServer), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(Body), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(BodyController), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(DragController), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(VelocityController), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(ODEObject), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(Space), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(World), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(Joint), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(BallJoint), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(HingeJoint), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(FixedJoint), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(SliderJoint), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(UniversalJoint), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(Hinge2Joint), "oxygen/");

    // collider
    zg.GetCore()->RegisterClassObject(new CLASS(Collider), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(BoxCollider), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(CCylinderCollider), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(PlaneCollider), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(RayCollider), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(SphereCollider), "oxygen/");

    // collision handler
    zg.GetCore()->RegisterClassObject(new CLASS(CollisionHandler), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(ContactJointHandler), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(RecorderHandler), "oxygen/");

    // agentaspect
    zg.GetCore()->RegisterClassObject(new CLASS(AgentAspect), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(Effector), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(Perceptor), "oxygen/");

#ifdef HAVE_SPADES_HEADERS
    // spades
    zg.GetCore()->RegisterClassObject(new CLASS(SpadesServer), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(ParamReader), "oxygen/");
#endif

    // monitor
    zg.GetCore()->RegisterClassObject(new CLASS(MonitorServer), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(MonitorSystem), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(CustomMonitor), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(MonitorItem),    "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(MonitorCmdParser),"oxygen/");

    // game control and controlaspects
    zg.GetCore()->RegisterClassObject(new CLASS(BaseParser), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(GameControlServer), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(ControlAspect), "oxygen/");
    zg.GetCore()->RegisterClassObject(new CLASS(ActionObject), "oxygen/");

    // run the oxygen init script
    zg.GetCore()->GetRoot()->GetScript()->RunInitScript
        (
         "oxygen.rb",
         "lib/oxygen",
         ScriptServer::IS_COMMON
         );
}

--- NEW FILE: Makefile.am ---
if DEBUG
pkglib_LTLIBRARIES = liboxygen_debug.la
liboxygen_debug_la_SOURCES = $(sources) $(spades_sources)
liboxygen_debug_la_CXXFLAGS = -O -g -W -Wall -Woverloaded-virtual -Wno-deprecated 
liboxygen_debug_la_LIBADD = -lode ${spades_libs}
liboxygen_debug_la_LDFLAGS = \
	-version-info @oxygen_version_info@ \
	${top_srcdir}/utility/rcssnet/librcssnet3D.la

else
pkglib_LTLIBRARIES = liboxygen.la
liboxygen_la_SOURCES = $(sources) $(spades_sources)
liboxygen_la_CXXFLAGS = -O2 -Wno-deprecated 
liboxygen_la_LIBADD = -lode $(spades_libs) 
liboxygen_la_LDFLAGS = \
	-version-info @oxygen_version_info@ \
	${top_srcdir}/utility/rcssnet/librcssnet3D.la
endif

AM_CPPFLAGS = -I${top_srcdir}/lib -I${top_srcdir}/utility @RUBY_CPPFLAGS@

## define include directory local to the pkgincludedir
libpkgincludedir = $(includedir)/@PACKAGE@/oxygen

## architecture independent data (scripts) to be installed and distributed
dist_pkgdata_DATA = oxygen.rb

bin_SCRIPTS = oxygen-config

if BUILD_SPADES_MODULES
spades_sources = \
spadesserver/spadesserver.cpp \
spadesserver/spadesserver_c.cpp \
spadesserver/paramreader.cpp \
spadesserver/paramreader_c.cpp \
spadesserver/paramstorer.cpp \
spadesserver/spadescreatesenseevent.cpp \
spadesserver/spadesactevent.cpp
spades_headers = \
spadesserver/spadesserver.h \
spadesserver/paramreader.h \
spadesserver/paramstorer.h \
spadesserver/spadescreatesenseevent.h \
spadesserver/spadesactevent.h
spades_libs = -lspades
else
spades_sources =
spades_headers =
spades_libs =
endif

sources = \
agentaspect/agentaspect.cpp \
agentaspect/agentaspect_c.cpp \
agentaspect/effector.cpp \
agentaspect/effector_c.cpp \
agentaspect/perceptor.cpp \
agentaspect/perceptor_c.cpp \
controlaspect/controlaspect.cpp \
controlaspect/controlaspect_c.cpp \
gamecontrolserver/actionobject_c.cpp \
gamecontrolserver/baseparser_c.cpp \
gamecontrolserver/gamecontrolserver.cpp \
gamecontrolserver/gamecontrolserver_c.cpp \
gamecontrolserver/predicate.cpp \
oxygen.cpp \
physicsserver/body.cpp \
physicsserver/body_c.cpp \
physicsserver/bodycontroller.cpp \
physicsserver/bodycontroller_c.cpp \
physicsserver/boxcollider.cpp \
physicsserver/boxcollider_c.cpp \
physicsserver/ccylindercollider.cpp \
physicsserver/ccylindercollider_c.cpp \
physicsserver/collider.cpp \
physicsserver/collider_c.cpp \
physicsserver/collisionhandler.cpp \
physicsserver/collisionhandler_c.cpp \
physicsserver/contactjointhandler.cpp \
physicsserver/contactjointhandler_c.cpp \
physicsserver/odeobject.cpp \
physicsserver/odeobject_c.cpp \
physicsserver/physicsserver.cpp \
physicsserver/physicsserver_c.cpp \
physicsserver/planecollider.cpp \
physicsserver/planecollider_c.cpp \
physicsserver/raycollider.cpp \
physicsserver/raycollider_c.cpp \
physicsserver/recorderhandler.cpp \
physicsserver/recorderhandler_c.cpp \
physicsserver/space.cpp \
physicsserver/space_c.cpp \
physicsserver/spherecollider.cpp \
physicsserver/spherecollider_c.cpp \
physicsserver/world.cpp \
physicsserver/world_c.cpp \
physicsserver/dragcontroller.cpp \
physicsserver/dragcontroller_c.cpp \
physicsserver/velocitycontroller.cpp \
physicsserver/velocitycontroller_c.cpp \
physicsserver/joint.cpp \
physicsserver/joint_c.cpp \
physicsserver/balljoint.cpp \
physicsserver/balljoint_c.cpp \
physicsserver/hingejoint.cpp \
physicsserver/hingejoint_c.cpp \
physicsserver/fixedjoint.cpp \
physicsserver/fixedjoint_c.cpp \
physicsserver/sliderjoint.cpp \
physicsserver/sliderjoint_c.cpp \
physicsserver/universaljoint.cpp \
physicsserver/universaljoint_c.cpp \
physicsserver/hinge2joint.cpp \
physicsserver/hinge2joint_c.cpp \
physicsserver/angularmotor.cpp \
physicsserver/angularmotor_c.cpp \
sceneserver/basenode.cpp \
sceneserver/basenode_c.cpp \
sceneserver/fpscontroller.cpp \
sceneserver/fpscontroller_c.cpp \
sceneserver/scene.cpp \
sceneserver/scene_c.cpp \
sceneserver/sceneserver.cpp \
sceneserver/sceneserver_c.cpp \
sceneserver/sceneimporter_c.cpp \
sceneserver/transform.cpp \
sceneserver/transform_c.cpp \
sceneserver/camera.cpp \
sceneserver/camera_c.cpp \
simulationserver/simulationserver.h \
simulationserver/simulationserver.cpp \
simulationserver/simulationserver_c.cpp \
simulationserver/simcontrolnode.cpp \
simulationserver/simcontrolnode_c.cpp \
simulationserver/agentcontrol.cpp \
simulationserver/agentcontrol_c.cpp \
simulationserver/monitorcontrol.cpp \
simulationserver/monitorcontrol_c.cpp \
simulationserver/netcontrol.cpp \
simulationserver/netcontrol_c.cpp \
simulationserver/netclient.cpp \
simulationserver/netclient_c.cpp \
simulationserver/netmessage.cpp \
simulationserver/netmessage_c.cpp \
simulationserver/netbuffer.cpp \
geometryserver/geometryserver.h \
geometryserver/geometryserver.cpp \
geometryserver/geometryserver_c.cpp \
geometryserver/meshimporter.cpp \
geometryserver/meshimporter_c.cpp \
geometryserver/stdmeshimporter.cpp \
geometryserver/stdmeshimporter_c.cpp \
geometryserver/trimesh.cpp \
geometryserver/indexbuffer.cpp \
monitorserver/monitorserver.cpp \
monitorserver/monitorserver_c.cpp \
monitorserver/monitorsystem.cpp \
monitorserver/monitorsystem_c.cpp \
monitorserver/monitoritem_c.cpp \
monitorserver/custommonitor.cpp \
monitorserver/custommonitor_c.cpp \
monitorserver/monitorcmdparser.cpp \
monitorserver/monitorcmdparser_c.cpp

nobase_libpkginclude_HEADERS = \
agentaspect/agentaspect.h \
agentaspect/effector.h \
agentaspect/perceptor.h \
agentaspect/createaction.h \
controlaspect/controlaspect.h \
gamecontrolserver/predicate.h \
gamecontrolserver/gamecontrolserver.h \
gamecontrolserver/baseparser.h \
gamecontrolserver/actionobject.h \
oxygen.h \
physicsserver/body.h \
physicsserver/bodycontroller.h \
physicsserver/boxcollider.h \
physicsserver/ccylindercollider.h \
physicsserver/collider.h \
physicsserver/collisionhandler.h \
physicsserver/contactjointhandler.h \
physicsserver/odeobject.h \
physicsserver/physicsserver.h \
physicsserver/planecollider.h \
physicsserver/raycollider.h \
physicsserver/recorderhandler.h \
physicsserver/space.h \
physicsserver/spherecollider.h \
physicsserver/world.h \
physicsserver/dragcontroller.h \
physicsserver/velocitycontroller.h \
physicsserver/joint.h \
physicsserver/balljoint.h \
physicsserver/hingejoint.h \
physicsserver/fixedjoint.h \
physicsserver/sliderjoint.h \
physicsserver/universaljoint.h \
physicsserver/hinge2joint.h \
physicsserver/angularmotor.h \
sceneserver/sceneimporter.h \
sceneserver/basenode.h \
sceneserver/fpscontroller.h \
sceneserver/scene.h \
sceneserver/sceneserver.h \
sceneserver/sceneimporter.h \
sceneserver/transform.h \
sceneserver/camera.h \
simulationserver/simulationserver.h \
simulationserver/simcontrolnode.h \
simulationserver/agentcontrol.h \
simulationserver/monitorcontrol.h \
simulationserver/netcontrol.h \
simulationserver/netclient.h \
simulationserver/netmessage.h \
simulationserver/netbuffer.h \
geometryserver/geometryserver.h \
geometryserver/meshimporter.h \
geometryserver/stdmeshimporter.h \
geometryserver/trimesh.h \
geometryserver/indexbuffer.h \
monitorserver/monitorserver.h \
monitorserver/monitorsystem.h \
monitorserver/monitoritem.h \
monitorserver/custommonitor.h \
monitorserver/monitorcmdparser.h \
$(spades_headers)