Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4572 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Jun 10, 2005, 1:17:13 AM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: newmat lib now works with cd and cd-subproject

Location:
orxonox/trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/defs/include_paths.am

    r4529 r4572  
    1717AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics/fields
    1818AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/collision_detection
     19AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/newmat
    1920AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound
    2021AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs

  • orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

    r4568 r4572  
    2323
    2424#include <math.h>
     25
     26
     27#define WANT_STREAM
     28#define WANT_MATH
     29#define WANT_FSTREAM
     30
     31
     32#include "include.h"
     33#include "newmat.h"
     34#include "newmatap.h"
     35#include "newmatio.h"
     36
     37
     38
    2539
    2640using namespace std;
    … …  
    152166     vectors
    153167  */
     168   
     169  SymmetricMatrix C(3);
     170 
     171  C(1,1) = 1;
     172  C(1,2) = 4;
     173  C(1,3) = 4;
     174  C(2,1) = 4; 
     175  C(2,2) = 2;
     176  C(2,3) = 4;
     177  C(3,1) = 4;
     178  C(3,2) = 4;
     179  C(3,3) = 3;
     180 
     181  // cout << "The symmetrix matrix C" << endl;
     182  //cout << setw(5) << setprecision(0) << C << endl;
     183
     184  Matrix                V(3,3); // for eigenvectors
     185  DiagonalMatrix        D(3);   // for eigenvalues
     186 
     187  // the decomposition
     188  Jacobi(C, D, V);
     189
     190
     191  // Print the result
     192 /* cout << "The eigenvalues matrix:" << endl;
     193  cout << setw(10) << setprecision(5) << D << endl;
     194  cout << "The eigenvectors matrix:" << endl;*/
    154195 
    155196

  • orxonox/trunk/src/lib/newmat/Makefile

    r4569 r4572  
    2626top_builddir = ../../..
    2727am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    28 INSTALL = /usr/bin/install -c
     28INSTALL = /bin/install -c
    2929install_sh_DATA = $(install_sh) -c -m 644
    3030install_sh_PROGRAM = $(install_sh) -c
    … …  
    107107CTAGS = ctags
    108108DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    109 ACLOCAL = ${SHELL} /home/bensch/svn/orxonox/trunk/missing --run aclocal-1.8
     109ACLOCAL = ${SHELL} /home/boenzlip/orxonox/repos/trunk/missing --run aclocal-1.8
    110110AMDEP_FALSE = #
    111111AMDEP_TRUE =
    112 AMTAR = ${SHELL} /home/bensch/svn/orxonox/trunk/missing --run tar
    113 AUTOCONF = ${SHELL} /home/bensch/svn/orxonox/trunk/missing --run autoconf
    114 AUTOHEADER = ${SHELL} /home/bensch/svn/orxonox/trunk/missing --run autoheader
    115 AUTOMAKE = ${SHELL} /home/bensch/svn/orxonox/trunk/missing --run automake-1.8
     112AMTAR = ${SHELL} /home/boenzlip/orxonox/repos/trunk/missing --run tar
     113AUTOCONF = ${SHELL} /home/boenzlip/orxonox/repos/trunk/missing --run autoconf
     114AUTOHEADER = ${SHELL} /home/boenzlip/orxonox/repos/trunk/missing --run autoheader
     115AUTOMAKE = ${SHELL} /home/boenzlip/orxonox/repos/trunk/missing --run automake-1.8
    116116AWK = gawk
    117117CC = gcc
    … …  
    121121CPPFLAGS = -I/usr/X11R6/include -I/usr/include/SDL
    122122CURL_CFLAGS =
    123 CURL_LIBS = -L/usr/lib -lcurl -lidn -lssl -lcrypto -ldl -lssl -lcrypto -ldl -lz
     123CURL_LIBS =
    124124CXX = g++
    125125CXXDEPMODE = depmode=gcc3
    … …  
    141141GPROF = /usr/bin/gprof
    142142GTK2_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include 
    143 GTK2_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 
    144 HAVE_CURL_FALSE = #
    145 HAVE_CURL_TRUE =
     143GTK2_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 
     144HAVE_CURL_FALSE =
     145HAVE_CURL_TRUE = #
    146146HAVE_GTK2_FALSE = #
    147147HAVE_GTK2_TRUE =
    … …  
    154154LIBS = -lm  -lGL -lGLU -lSDL -lopenal -logg -lvorbis -lvorbisfile -lSDL_ttf -lSDL_image
    155155LTLIBOBJS =
    156 MAKEINFO = ${SHELL} /home/bensch/svn/orxonox/trunk/missing --run makeinfo
     156MAKEINFO = ${SHELL} /home/boenzlip/orxonox/repos/trunk/missing --run makeinfo
    157157MSBITFIELDS =
    158158OBJEXT = o
    … …  
    198198includedir = ${prefix}/include
    199199infodir = ${prefix}/info
    200 install_sh = /home/bensch/svn/orxonox/trunk/install-sh
     200install_sh = /home/boenzlip/orxonox/repos/trunk/install-sh
    201201libdir = ${exec_prefix}/lib
    202202libexecdir = ${exec_prefix}/libexec

  • orxonox/trunk/src/subprojects/collision_detection/Makefile.am

    r4549 r4572  
    1010                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
    1111                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     12                  $(MAINSRCDIR)/lib/newmat/libnewmat.a \
    1213                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
    1314                  -lpthread
    … …  
    3738                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    3839                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
    39                    $(MAINSRCDIR)/lib/gui/gui_gtk.cc
     40                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
     41                   $(MAINSRCDIR)/lib/newmat/include.h \
     42                   $(MAINSRCDIR)/lib/newmat/newmat.h \
     43                   $(MAINSRCDIR)/lib/newmat/newmatap.h \
     44                   $(MAINSRCDIR)/lib/newmatio.h

  • orxonox/trunk/src/subprojects/collision_detection/Makefile.in

    r4549 r4572  
    7171        $(MAINSRCDIR)/lib/event/libORXevent.a \
    7272        $(MAINSRCDIR)/lib/sound/libORXsound.a \
    73         $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a $(am__DEPENDENCIES_1) \
     73        $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     74        $(MAINSRCDIR)/lib/newmat/libnewmat.a $(am__DEPENDENCIES_1) \
    7475        $(am__DEPENDENCIES_1)
    7576DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    … …  
    103104CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    104105        -o $@
     106COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     107        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     108CCLD = $(CC)
     109LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    105110SOURCES = $(collision_SOURCES)
    106111DIST_SOURCES = $(collision_SOURCES)
    … …  
    222227                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
    223228                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     229                  $(MAINSRCDIR)/lib/newmat/libnewmat.a \
    224230                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
    225231                  -lpthread
    … …  
    249255                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    250256                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
    251                    $(MAINSRCDIR)/lib/gui/gui_gtk.cc
     257                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
     258                   $(MAINSRCDIR)/lib/newmat/include.h \
     259                   $(MAINSRCDIR)/lib/newmat/newmat.h \
     260                   $(MAINSRCDIR)/lib/newmat/newmatap.h \
     261                   $(MAINSRCDIR)/lib/newmatio.h
    252262
    253263all: all-am
Note: See TracChangeset for help on using the changeset viewer.