Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3416 in orxonox.OLD


Ignore:
Timestamp:
Feb 21, 2005, 5:09:15 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/dave: injected Doxygen-tags

Location:
orxonox/branches/dave/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/dave/src/Makefile.am

    r3411 r3416  
    7979                 curve.h \
    8080                 glmenu_imagescreen.h \
    81                  debug.h\
     81                 debug.h \
    8282                 skysphere.h
    8383

  • orxonox/branches/dave/src/Makefile.in

    r3411 r3416  
    1 # Makefile.in generated by automake 1.8.3 from Makefile.am.
     1# Makefile.in generated by automake 1.8.5 from Makefile.am.
    22# @configure_input@
    33
    … …  
    6464        helper_parent.$(OBJEXT) track_manager.$(OBJEXT) \
    6565        matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
    66         skybox.$(OBJEXT)
     66        skysphere.$(OBJEXT)
    6767orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    6868orxonox_LDADD = $(LDADD)
    … …  
    8585@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/orxonox.Po \
    8686@AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po ./$(DEPDIR)/player.Po \
    87 @AMDEP_TRUE@    ./$(DEPDIR)/skybox.Po ./$(DEPDIR)/story_entity.Po \
    88 @AMDEP_TRUE@    ./$(DEPDIR)/texture.Po ./$(DEPDIR)/track.Po \
    89 @AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po ./$(DEPDIR)/vector.Po \
    90 @AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
     87@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
     88@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/texture.Po \
     89@AMDEP_TRUE@    ./$(DEPDIR)/track.Po ./$(DEPDIR)/track_manager.Po \
     90@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/world.Po \
     91@AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Po
    9192CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    9293        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    279280                 curve.h \
    280281                 glmenu_imagescreen.h \
    281                  debug.h\
     282                 debug.h \
    282283                 skysphere.h
    283284
    … …  
    384385@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
    385386@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
    386 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Po@am__quote@
     387@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
    387388@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
    388389@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
    … …  
    547548        tags=; \
    548549        here=`pwd`; \
    549         if (etags --etags-include --version) >/dev/null 2>&1; then \
     550        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
    550551          include_option=--etags-include; \
     552          empty_fix=.; \
    551553        else \
    552554          include_option=--include; \
     555          empty_fix=; \
    553556        fi; \
    554557        list='$(SUBDIRS)'; for subdir in $$list; do \
    555558          if test "$$subdir" = .; then :; else \
    556             test -f $$subdir/TAGS && \
     559            test ! -f $$subdir/TAGS || \
    557560              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
    558561          fi; \
    … …  
    564567          $(AWK) '    { files[$$0] = 1; } \
    565568               END { for (i in files) print i; }'`; \
    566         test -z "$(ETAGS_ARGS)$$tags$$unique" \
    567           || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    568              $$tags $$unique
     569        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     570          test -n "$$unique" || unique=$$empty_fix; \
     571          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     572            $$tags $$unique; \
     573        fi
    569574ctags: CTAGS
    570575CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

  • orxonox/branches/dave/src/skysphere.cc

    r3411 r3416  
    11
    2 /* Created by Dave, this file is actually quite similar to player.cc and so is
     2/*
     3   orxonox - the future of 3D-vertical-scrollers
     4
     5   Copyright (C) 2004 orx
     6
     7   This program is free software; you can redistribute it and/or modify
     8   it under the terms of the GNU General Public License as published by
     9   the Free Software Foundation; either version 2, or (at your option)
     10   any later version.
     11
     12   ### File Specific:
     13   main-programmer: David Gruetter
     14   co-programmer: ...
     15
     16
     17    Created by Dave, this file is actually quite similar to player.cc and so is
    318    skybox.h similar to player.h
    419    With that said, things should be clear:)
    … …  
    1732using namespace std;
    1833
     34/**
     35   \brief Standart Constructor
     36   \todo second Constructor with char* input for different skies
     37*/
    1938Skysphere::Skysphere()
    2039{ 
    … …  
    2544    sky->setDiffuseMap("../data/pictures/sky-replace.jpg");
    2645    sky->setIllum(3);
     46    //    sky->setAmbient(1,1,1);
    2747
    2848}
    2949
     50/**
     51   \brief default destructor
     52*/
    3053Skysphere::~Skysphere()
    3154{
    … …  
    3558}
    3659
     60/**
     61   \brief updates the position of the Skysphere
     62   \param x the x-coordinate of the Center of the Sphere
     63   \param y the y-coordinate of the Center of the Sphere
     64   \param z the z-coordinate of the Center of the Sphere
     65
     66   This is normally done in the update-phase of world, so the Skysphere is always centered at the Camera.
     67*/
    3768void Skysphere::updatePosition(float x,float y,float z)
    3869{
    … …  
    4273}
    4374
     75/**
     76   \brief draws the Skysphere
    4477
     78   This part is normally precessed in the "Painting Phase".
     79*/
     80   
    4581void Skysphere::draw()
    4682{

  • orxonox/branches/dave/src/skysphere.h

    r3412 r3416  
     1/*!
     2    \file skysphere.h
     3    \brief Definition of the Skysphere, that handles the Display of an atmosphere of orxonox.
     4
     5    A SkySphere is always centered at the current working Camera, and will only obey the cameras
     6    movment but not its rotation.
     7
     8    \todo self-rotation
     9    \todo handle reference to parent-object
     10*/
     11
    112#ifndef _SKYSPHERE_H
    213#define _SKYSPHERE_H
     14
     15
    316#include "importer/material.h"
    417#include "p_node.h"
    518#include "world_entity.h"
    619
     20//! A Class to handle a SkySphere
    721class Skysphere: public PNode
    822{
    923
    1024
    11 private:
    12     GLUquadricObj *sphereObj;
    13     float a,b,c;
    14     Material *sky;
    15    
    16 
    17 public:
    18    Skysphere();
    19    ~Skysphere();
    20    
    21    
    22    
    23    
    24    void updatePosition(float x,float y,float z);
    25    void draw();
    26    
     25 private:
     26  GLUquadricObj *sphereObj;
     27  float a,b,c;       //!< Parameters to hold the Position of the SkySphere
     28  Material *sky;     //!< A Material for the Sky
     29 
     30 
     31 public:
     32  Skysphere();
     33  ~Skysphere();
     34 
     35 
     36 
     37 
     38  void updatePosition(float x,float y,float z);
     39  void draw();
     40 
    2741   
    2842   
Note: See TracChangeset for help on using the changeset viewer.