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

Timestamp:

Apr 29, 2006, 12:13:38 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: move the Pollution of the ShellCommand to some other File

Location:

trunk/src/lib

Files:

• coord/p_node.cc (modified) (1 diff)
• graphics/graphics_engine.cc (modified) (2 diffs)
• graphics/text_engine/font.cc (modified) (1 diff)
• graphics/text_engine/font.h (modified) (1 diff)
• graphics/text_engine/text_engine.cc (modified) (2 diffs)
• lang/class_list.cc (modified) (2 diffs)
• shell/Makefile.am (modified) (1 diff)
• shell/some_shell_commands.cc (copied) (copied from trunk/src/proto/proto_class.cc) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -29 +29 @@
 
 #include "synchronizeable.h"
-
-#include "shell_command.h"
-SHELL_COMMAND(debugNode, PNode, debugNodeSC);
 
 using namespace std;

trunk/src/lib/graphics/graphics_engine.cc

@@ -571 +571 @@
   //  LightManager::getInstance()->draw();
 
-  GraphicsEngine::storeMatrices();
-  Shader::suspendShader();
-
-  Render2D::getInstance()->draw(E2D_LAYER_ALL);
-  Shader::restoreShader();
-
   if (this->graphicsEffects != NULL)
   {
@@ -584 +578 @@
       dynamic_cast<GraphicsEffect*>(*it)->draw();
   }
+  GraphicsEngine::storeMatrices();
+  Shader::suspendShader();
+
+  Render2D::getInstance()->draw(E2D_LAYER_ALL);
+  Shader::restoreShader();
 }
 

trunk/src/lib/graphics/text_engine/font.cc

@@ -29 +29 @@
 #include "stdlibincl.h"
 #include "compiler.h"
-
 using namespace std;
 

trunk/src/lib/graphics/text_engine/font.h

@@ -74 +74 @@
     inline TTF_Font* getTTF() const { return this->fontTTF; };
 
-
     /** @returns the default Font */
     inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };

trunk/src/lib/graphics/text_engine/text_engine.cc

@@ -37 +37 @@
 
 #include "debug.h"
-
 ///////////////////
 /// TEXT-ENGINE ///
@@ -104 +103 @@
 /**
  *  function to disable TTF_fonts
-*/
+ */
 void TextEngine::disableFonts()
 {

trunk/src/lib/lang/class_list.cc

@@ -22 +22 @@
 #include "debug.h"
 #include <string.h>
-#include <math.h>
+#include <cmath>
 #include <algorithm>
-#include "shell_command.h"
-
 using namespace std;
-
-#ifndef NO_SHELL_COMMAND
-SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debugS)
-    ->describe("Shows all registered classes, if param1: is a valid ClassName only values of this class are shown. param2: how much output")
-    ->defaultValues(MT_NULL, 1);
-#endif
 
 /**
@@ -353 +345 @@
     {
       lenCount = 1;
-      while (pow(10, lenCount) <= (*cl).objectList.size())
+      while (std::pow((float)10, (int)lenCount) <= (*cl).objectList.size())
         ++lenCount;
       for (int i=0; i < 30-(*cl).className.size() - lenCount; i++)

trunk/src/lib/shell/Makefile.am

@@ -22 +22 @@
                 shell_completion.h \
                 shell_completion_plugin.h
+
+EXTRA_DIST = some_shell_commands.cc

trunk/src/lib/shell/some_shell_commands.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
 
+/*!
+ * @file some_shell_commands.cc
+ * @brief All the ShellCommands, that should not pollute the SourceCode.
+ */
+
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
-
-using namespace std;
+#include "shell/shell_command.h"
+using namespace OrxShell;
 
 
-/**
- * standard constructor
- * @todo this constructor is not jet implemented - do it
-*/
-ProtoClass::ProtoClass ()
-{
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
 
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
+#include "class_list.h"
+  SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debugS)
+      ->describe("Shows all registered classes, if param1: is a valid ClassName only values of this class are shown. param2: how much output")
+      ->defaultValues(MT_NULL, 1);
 
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
-}
+#include "p_node.h"
+  SHELL_COMMAND(debugNode, PNode, debugNodeSC);
+  SHELL_COMMAND(setPosition, PNode, setAbsCoor);
 
 
-/**
- * standard deconstructor
-*/
-ProtoClass::~ProtoClass ()
-{
-  // delete what has to be deleted here
-}
+#include "material.h"
+  SHELL_COMMAND(setDiffuseTexture, Material, setDiffuseMap)
+      ->defaultValues(MT_NULL, (int)GL_TEXTURE_2D)
+      ->completionPlugin(0, CompletorFileSystem());
+