Changeset 9304 in orxonox.OLD

Timestamp:

Jul 17, 2006, 1:42:41 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: virtual public and an ip class

Location:

branches/proxy/src/lib

Files:

• coord/p_node.h (modified) (3 diffs)
• lang/base_object.cc (modified) (1 diff)
• network/netdefs.h (modified) (1 diff)
• util/ip.cc (copied) (copied from branches/proxy/src/lib/util/timer.cc) (1 diff)
• util/ip.h (copied) (copied from branches/proxy/src/lib/util/timer.h) (2 diffs)

branches/proxy/src/lib/coord/p_node.h

@@ -20 +20 @@
 
 #include "base_object.h"
-#include "stdincl.h"
 #include "synchronizeable.h"
 
@@ -74 +73 @@
 
 //! Patent Node is a Engine to calculate the position of an Object in respect to the position of its parent.
-class PNode : virtual public BaseObject, virtual public Synchronizeable {
+class PNode : virtual public BaseObject, public Synchronizeable {
  public:
   PNode (PNode* parent = PNode::getNullParent(), long nodeFlags = PNODE_PARENT_MODE_DEFAULT);
@@ -112 +111 @@
   /** @returns the absolute position */
   inline const Vector& getLastAbsCoor () const { return this->lastAbsCoordinate; };
-  
+
   void shiftCoor (const Vector& shift);
   void shiftCoor (float x, float y, float z) { this->shiftCoor(Vector(x, y, z)); };

branches/proxy/src/lib/lang/base_object.cc

@@ -23 +23 @@
 
 #include "synchronizeable.h"
-
-using namespace std;
 
 

branches/proxy/src/lib/network/netdefs.h

@@ -20 +20 @@
  * @file network_manager.h
  *  Main interface for the network module. Manages all the modules
-
  */
 

branches/proxy/src/lib/util/ip.cc

@@ -1 +1 @@
 /**
- * @file timer.cc
- * @brief A Timer class, that handles all about time.
+ * @file ip.cc
+ * @brief A IP class, that handles all about time.
  *
  * code taken from audiere.
  */
 
-#include "timer.h"
+#include "ip.h"
+
+IP::IP()
+{}
 
 
-#include <time.h>
-#include <sys/time.h>
+IP::IP(int ip)
+{
+  this->_ip = ip;
+}
 
-#ifdef __WIN32__
-#include <windows.h>
-int gettimeofday
-      (struct timeval* tp, void* tzp) {
-    DWORD t;
-    t = timeGetTime();
-    tp->tv_sec = t / 1000;
-    tp->tv_usec = 1000 * (t % 1000 );
-    /* 0 indicates success. */
-    return 0;
+IP::IP(const std::string& ip)
+{
+  this->_ip = IP::stringToIP(ip);
 }
-#endif
 
-/**
- * @returns the current time in Second exact to the micro-second
- */
-double Timer::getNow() {
 
-#if HAVE_CLOCK_GETTIME
+int IP::stringToIP(const std::string& ip)
+{
 
-   // use the POSIX realtime clock to get the current time
-    struct timespec tp;
-    int result = clock_gettime(CLOCK_REALTIME, &tp);
-    if (result == 0) {
-      return tp.tv_sec * tp.tv_nsec / 1000000000.0;
-    }
-#endif
 
-    // can't use realtime clock!  Try to use gettimeofday
-    struct timeval tv;
-    gettimeofday(&tv, 0);
-    return tv.tv_sec + tv.tv_usec / 1000000.0;
 }
+
+const std::string& IP::ipToString(int ip)
+{
+  std::string ipaddr;
+
+  number = SDLNet_Read32 (&addr.host);
+  printf ("Host-Reihenfolge:     %d.%d.%d.%d\n",
+          (number & 0xFF000000)>>24, (number & 0x00FF0000)>>16,
+          (number & 0x0000FF00)>>8, (number & 0x000000FF));
+}
+

branches/proxy/src/lib/util/ip.h

@@ -1 +1 @@
 
 /*!
- * @file timer.h
+ * @file ip.h
  * @brief Definition of Time Class.
  *
@@ -7 +7 @@
  */
 
-#ifndef __TIMER_H__
-#define __TIMER_H__
+#ifndef __IP_H__
+#define __IP_H__
+
+#include <string>
+
+#include "netdefs.h"
+
 
 //! A class to handle time itself
-class Timer
+class IP
 {
-public:
-  static double getNow();
+  public:
+    IP();
+    IP(const std::string& ip);
+    IP(int ip);
+
+
+    float ip() const;
+    float ip(unsigned int part) const;
+
+    std::string& ipString() const;
+
+
+
+  public:
+    static int stringToIP(const std::string& ip);
+    static const std::string& ipToString(int ip);
+
+  private:
+    int           _ip;  //!< the IP in int form.
 
 
 };
 
-#endif /* __TIMER_H__ */
+#endif /* __IP_H__ */