Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5040 in orxonox.OLD for orxonox/trunk/src


Ignore:
Timestamp:
Aug 16, 2005, 7:24:18 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: inventing a new Way to get all the different kinds of User-Interface-Control below one hat.
This should be the ground-stone for all the different Camera-Modi as proposed in ticket:60 and ticket:61.
Maybe, there will be a better idea soon. In this case i would not implement, what i am doing here. :/

Location:
orxonox/trunk/src
Files:
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r5010 r5040  
    4646                  util/loading/load_param.cc \
    4747                  util/state.cc \
     48                  util/user_control.cc \
    4849                  story_entities/story_entity.cc \
    4950                  story_entities/campaign.cc \
    … …  
    9899                 util/garbage_collector.h \
    99100                 util/state.h \
     101                 util/user_control.h \
    100102                 util/resource_manager.h \
    101103                 util/loading/factory.h \

  • orxonox/trunk/src/Makefile.in

    r5010 r5040  
    6262        orxonox-resource_manager.$(OBJEXT) orxonox-factory.$(OBJEXT) \
    6363        orxonox-load_param.$(OBJEXT) orxonox-state.$(OBJEXT) \
    64         orxonox-story_entity.$(OBJEXT) orxonox-campaign.$(OBJEXT) \
    65         orxonox-world.$(OBJEXT) orxonox-world_entity.$(OBJEXT) \
    66         orxonox-camera.$(OBJEXT) orxonox-player.$(OBJEXT) \
    67         orxonox-npc.$(OBJEXT) orxonox-environment.$(OBJEXT) \
    68         orxonox-skysphere.$(OBJEXT) orxonox-skybox.$(OBJEXT) \
    69         orxonox-terrain.$(OBJEXT) orxonox-satellite.$(OBJEXT) \
     64        orxonox-user_control.$(OBJEXT) orxonox-story_entity.$(OBJEXT) \
     65        orxonox-campaign.$(OBJEXT) orxonox-world.$(OBJEXT) \
     66        orxonox-world_entity.$(OBJEXT) orxonox-camera.$(OBJEXT) \
     67        orxonox-player.$(OBJEXT) orxonox-npc.$(OBJEXT) \
     68        orxonox-environment.$(OBJEXT) orxonox-skysphere.$(OBJEXT) \
     69        orxonox-skybox.$(OBJEXT) orxonox-terrain.$(OBJEXT) \
     70        orxonox-satellite.$(OBJEXT) \
    7071        orxonox-character_attributes.$(OBJEXT) \
    7172        orxonox-test_entity.$(OBJEXT) orxonox-weapon_manager.$(OBJEXT) \
    … …  
    133134@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-track_node.Po \
    134135@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-turret.Po \
     136@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-user_control.Po \
    135137@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-vector.Po \
    136138@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-weapon.Po \
    … …  
    301303                  util/loading/load_param.cc \
    302304                  util/state.cc \
     305                  util/user_control.cc \
    303306                  story_entities/story_entity.cc \
    304307                  story_entities/campaign.cc \
    … …  
    353356                 util/garbage_collector.h \
    354357                 util/state.h \
     358                 util/user_control.h \
    355359                 util/resource_manager.h \
    356360                 util/loading/factory.h \
    … …  
    532536@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-track_node.Po@am__quote@
    533537@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-turret.Po@am__quote@
     538@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-user_control.Po@am__quote@
    534539@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-vector.Po@am__quote@
    535540@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-weapon.Po@am__quote@
    … …  
    777782@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    778783@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-state.obj `if test -f 'util/state.cc'; then $(CYGPATH_W) 'util/state.cc'; else $(CYGPATH_W) '$(srcdir)/util/state.cc'; fi`
     784
     785orxonox-user_control.o: util/user_control.cc
     786@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-user_control.o -MD -MP -MF "$(DEPDIR)/orxonox-user_control.Tpo" -c -o orxonox-user_control.o `test -f 'util/user_control.cc' || echo '$(srcdir)/'`util/user_control.cc; \
     787@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-user_control.Tpo" "$(DEPDIR)/orxonox-user_control.Po"; else rm -f "$(DEPDIR)/orxonox-user_control.Tpo"; exit 1; fi
     788@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/user_control.cc' object='orxonox-user_control.o' libtool=no @AMDEPBACKSLASH@
     789@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-user_control.Po' tmpdepfile='$(DEPDIR)/orxonox-user_control.TPo' @AMDEPBACKSLASH@
     790@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     791@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-user_control.o `test -f 'util/user_control.cc' || echo '$(srcdir)/'`util/user_control.cc
     792
     793orxonox-user_control.obj: util/user_control.cc
     794@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-user_control.obj -MD -MP -MF "$(DEPDIR)/orxonox-user_control.Tpo" -c -o orxonox-user_control.obj `if test -f 'util/user_control.cc'; then $(CYGPATH_W) 'util/user_control.cc'; else $(CYGPATH_W) '$(srcdir)/util/user_control.cc'; fi`; \
     795@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-user_control.Tpo" "$(DEPDIR)/orxonox-user_control.Po"; else rm -f "$(DEPDIR)/orxonox-user_control.Tpo"; exit 1; fi
     796@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/user_control.cc' object='orxonox-user_control.obj' libtool=no @AMDEPBACKSLASH@
     797@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-user_control.Po' tmpdepfile='$(DEPDIR)/orxonox-user_control.TPo' @AMDEPBACKSLASH@
     798@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     799@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-user_control.obj `if test -f 'util/user_control.cc'; then $(CYGPATH_W) 'util/user_control.cc'; else $(CYGPATH_W) '$(srcdir)/util/user_control.cc'; fi`
    779800
    780801orxonox-story_entity.o: story_entities/story_entity.cc

  • orxonox/trunk/src/defs/class_id.h

    r5039 r5040  
    134134  CL_EVENT                      =    0x00000501,
    135135  CL_KEY_MAPPER                 =    0x00000502,
    136   CL_CROSSHAIR                  =    0x0000050f,
     136  CL_USER_CONTROL               =    0x00000511,
     137  CL_CROSSHAIR                  =    0x00000512,
    137138
    138139  CL_WEAPON_MANAGER             =    0x00000503,

  • orxonox/trunk/src/util/user_control.cc

    r5038 r5040  
    1010
    1111   ### File Specific:
    12    main-programmer: ...
     12   main-programmer: Benjamin Grauer
    1313   co-programmer: ...
    1414*/
    … …  
    1616//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
    1717
    18 #include "proto_class.h"
     18#include "user_control.h"
    1919
    2020using namespace std;
    21 
    2221
    2322/**
    … …  
    2524 * @todo this constructor is not jet implemented - do it
    2625*/
    27 ProtoClass::ProtoClass ()
     26UserControl::UserControl ()
    2827{
    29    this->setClassID(CL_PROTO_ID, "ProtoClass");
     28   this->setClassID(CL_USER_CONTROL, "UserControl");
    3029
    3130   /* If you make a new class, what is most probably the case when you write this file
    … …  
    4544 * standard deconstructor
    4645*/
    47 ProtoClass::~ProtoClass ()
     46UserControl::~UserControl ()
    4847{
    4948  // delete what has to be deleted here

  • orxonox/trunk/src/util/user_control.h

    r5038 r5040  
    11/*!
    2  * @file proto_class.h
    3  * @brief Definition of ...
     2 * @file user_control.h
     3 * @brief Control of the stearing device by the User
    44*/
    55
    6 #ifndef _PROTO_CLASS_H
    7 #define _PROTO_CLASS_H
     6#ifndef _USER_CONTROL_H
     7#define _USER_CONTROL_H
    88
    99#include "base_object.h"
    1010
     11typedef enum ControlType
     12{
     13  CONTROL_AIM_MOVE_ON_SCREEN,
     14  CONTROL_AIM_STAYS_CENTERED,
     15  CONTROL_AIM_SMOOTHES_CAMERA,
     16  CONTROL_AIM_MOVES_SCREEN_ON_EDGE,
     17};
     18
    1119// FORWARD DECLARATION
     20class PNode;
    1221
    1322
    14 
    15 //! A class for ...
    16 class ProtoClass : public BaseObject {
     23//! A Class the main input device uses for stearing the Ship/human/whatsoever through the level
     24class UserControl : public BaseObject {
    1725
    1826 public:
    19   ProtoClass();
    20   virtual ~ProtoClass();
     27  UserControl();
     28  virtual ~UserControl();
    2129
     30  void setAffectedObjects(PNode* camera, PNode* target);
     31  void setFollowObject(PNode* follower);
     32
     33  void setControlType(ControlType controlType);
    2234
    2335 private:
     36   ControlType            controlType;
     37   float                  speed;
     38   float                  suspense;
     39
     40   PNode*                 camera;
     41   PNode*                 target;
     42   PNode*                 follower;
    2443
    2544};
    2645
    27 #endif /* _PROTO_CLASS_H */
     46#endif /* _USER_CONTROL_H */
Note: See TracChangeset for help on using the changeset viewer.