Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5673 in orxonox.OLD for trunk/src/lib


Ignore:
Timestamp:
Nov 21, 2005, 4:02:23 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: Matrix included into Project

Location:
trunk/src/lib
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/Makefile.am

    r5634 r5673  
    1717                            shell/libORXshell.a
    1818
    19 #libORXlibs_a_LIBDADD =      gui/gtk_gui/libORXgui.a \
     19#libORXlibs_a_LIBDADD =     gui/gtk_gui/libORXgui.a \
    2020                            gui/gl_gui/libORXglgui.a \
    2121                            graphics/importer/libORXimporter.a \
     
    4242                        util/executor/executor.cc \
    4343                        math/vector.cc \
     44                        math/matrix.cc \
    4445                        math/curve.cc
    4546
     
    5960                        util/multi_type.h \
    6061                        util/executor/executor.h \
     62                        math/matrix.h \
    6163                        math/vector.h \
    6264                        math/curve.h
  • trunk/src/lib/Makefile.in

    r5672 r5673  
    5858        ini_parser.$(OBJEXT) substring.$(OBJEXT) color.$(OBJEXT) \
    5959        helper_functions.$(OBJEXT) multi_type.$(OBJEXT) \
    60         executor.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT)
     60        executor.$(OBJEXT) vector.$(OBJEXT) matrix.$(OBJEXT) \
     61        curve.$(OBJEXT)
    6162libORXlibs_a_OBJECTS = $(am_libORXlibs_a_OBJECTS)
    6263DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
     
    215216#                            shell/libORXshell.a
    216217
    217 #libORXlibs_a_LIBDADD =      gui/gtk_gui/libORXgui.a \
     218#libORXlibs_a_LIBDADD =     gui/gtk_gui/libORXgui.a \
    218219#                            gui/gl_gui/libORXglgui.a \
    219220#                            graphics/importer/libORXimporter.a \
     
    239240                        util/executor/executor.cc \
    240241                        math/vector.cc \
     242                        math/matrix.cc \
    241243                        math/curve.cc
    242244
     
    256258                        util/multi_type.h \
    257259                        util/executor/executor.h \
     260                        math/matrix.h \
    258261                        math/vector.h \
    259262                        math/curve.h
     
    324327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper_functions.Po@am__quote@
    325328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
     329@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matrix.Po@am__quote@
    326330@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multi_type.Po@am__quote@
    327331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
     
    521525@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    522526@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f 'math/vector.cc'; then $(CYGPATH_W) 'math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/math/vector.cc'; fi`
     527
     528matrix.o: math/matrix.cc
     529@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT matrix.o -MD -MP -MF "$(DEPDIR)/matrix.Tpo" -c -o matrix.o `test -f 'math/matrix.cc' || echo '$(srcdir)/'`math/matrix.cc; \
     530@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/matrix.Tpo" "$(DEPDIR)/matrix.Po"; else rm -f "$(DEPDIR)/matrix.Tpo"; exit 1; fi
     531@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='math/matrix.cc' object='matrix.o' libtool=no @AMDEPBACKSLASH@
     532@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     533@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o matrix.o `test -f 'math/matrix.cc' || echo '$(srcdir)/'`math/matrix.cc
     534
     535matrix.obj: math/matrix.cc
     536@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT matrix.obj -MD -MP -MF "$(DEPDIR)/matrix.Tpo" -c -o matrix.obj `if test -f 'math/matrix.cc'; then $(CYGPATH_W) 'math/matrix.cc'; else $(CYGPATH_W) '$(srcdir)/math/matrix.cc'; fi`; \
     537@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/matrix.Tpo" "$(DEPDIR)/matrix.Po"; else rm -f "$(DEPDIR)/matrix.Tpo"; exit 1; fi
     538@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='math/matrix.cc' object='matrix.obj' libtool=no @AMDEPBACKSLASH@
     539@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     540@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o matrix.obj `if test -f 'math/matrix.cc'; then $(CYGPATH_W) 'math/matrix.cc'; else $(CYGPATH_W) '$(srcdir)/math/matrix.cc'; fi`
    523541
    524542curve.o: math/curve.cc
  • trunk/src/lib/math/matrix.cc

    r5670 r5673  
     1/*
     2   orxonox - the future of 3D-vertical-scrollers
     3
     4   Copyright (C) 2004 orx
     5
     6   This program is free software; you can redistribute it and/or modify
     7   it under the terms of the GNU General Public License as published by
     8   the Free Software Foundation; either version 2, or (at your option)
     9   any later version.
     10
     11### File Specific:
     12   main-programmer: Benjamin Grauer
     13   co-programmer: Patrick Boenzli
     14*/
     15#include "matrix.h"
    116
    217#include <stdio.h>
    318#include <math.h>
    4 #include "matrix.h"
    519
    620
  • trunk/src/lib/math/matrix.h

    r5668 r5673  
     1/*!
     2 * @file matrix.h
     3 * @brief Definition of a 3x3 matrix.
     4 */
     5
    16#include <math.h>
    2 
    3 /// @todo TAKE THIS OUT
    4 class Vector
    5 {
    6   public:
    7     Vector() {this->x = this->y = this->z = 0; };
    8     Vector (float x, float y, float z) { this->x=x; this->y = y; this->z = z; };
    9     inline const Vector& operator/= (float f) {if ((f == 0.0)) {this->x=0;this->y=0;this->z=0;} else {this->x /= f; this->y /= f; this->z /= f;} return *this; };
    10 
    11     float x, y, z;
    12     inline Vector cross (const Vector& v) const { return Vector(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x ); }
    13     inline float len() const { return sqrt (x*x+y*y+z*z); }
    14 };
    15 
     7#include "vector.h"
    168
    179
Note: See TracChangeset for help on using the changeset viewer.