Changeset ca44f82 in network-game for common

Timestamp:

Feb 24, 2013, 1:28:32 AM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

7b43385

Parents:

3a79253 (diff), 8f85180 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Updated files to correctly compile on Windows

Location:

common

Files:

• Common.cpp (modified) (2 diffs)
• Common.h (modified) (2 diffs)
• Message.cpp (modified) (2 diffs)
• Message.h (modified) (1 diff)
• Player.cpp (modified) (7 diffs)
• Player.h (modified) (1 diff)
• WorldMap.cpp (added)
• WorldMap.h (added)

common/Common.cpp

@@ -1 +1 @@
 #include "Common.h"
+
+#include <iostream>
+using namespace std;
+
+#if defined WINDOWS
+   #include <Windows.h>
+#elif defined LINUX
+   #include <time.h>
+#endif
 
 void set_nonblock(int sock)
@@ -13 +22 @@
    #endif
 }
+
+unsigned long long getCurrentMillis()
+{
+   unsigned long long numMilliseconds;
+
+   #if defined WINDOWS
+      numMilliseconds = GetTickCount();
+   #elif defined LINUX
+      timespec curTime;
+      clock_gettime(CLOCK_REALTIME, &curTime);
+
+      numMilliseconds = curTime.tv_sec*(unsigned long long)1000+curTime.tv_nsec/(unsigned long long)1000000;
+   #endif
+
+   return numMilliseconds;
+}

common/Common.h

@@ -13 +13 @@
 
 void set_nonblock(int sock);
+unsigned long long getCurrentMillis();
 
 typedef struct
@@ -18 +19 @@
    int x;
    int y;
-} PLAYER_POS;
+} POSITION;
+
+typedef struct
+{
+   float x;
+   float y;
+} FLOAT_POSITION;
 
 #endif

common/Message.cpp

@@ -11 +11 @@
 #endif
 
+#include <iostream>
+
+using namespace std;
+
 int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
 {
-   return sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
+   int ret =  sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));
+
+   cout << "Sent message of type " << msg->type << endl;
+
+   return ret;
 }
 
@@ -21 +29 @@
 
    // assume we don't care about the value of socklen
-   return recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, &socklen);
+   int ret =  recvfrom(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, &socklen);
+
+   if (ret > -1)
+      cout << "Received message of type " << msg->type << endl;
+
+   return ret;
 }

common/Message.h

@@ -6 +6 @@
 #define MSG_TYPE_LOGOUT       3
 #define MSG_TYPE_CHAT         4
-#define MSG_TYPE_PLAYER       5
+#define MSG_TYPE_PLAYER       5  // server sends this to update player positions
+#define MSG_TYPE_PLAYER_MOVE  6  // client sends this when a player wants to move
 
 typedef struct

common/Player.cpp

@@ -4 +4 @@
 #include <sstream>
 #include <cstring>
+#include <cmath>
 
 using namespace std;
@@ -12 +13 @@
    this->name = "";
    this->password = "";
-   this->pos.x = 0;
-   this->pos.y = 0;
+   this->pos.x = this->target.x = 0;
+   this->pos.y = this->target.y = 0;
+   this->timeLastUpdated = 0;
 }
 
@@ -23 +25 @@
    this->pos.x = p.pos.x;
    this->pos.y = p.pos.y;
+   this->target.x = p.target.x;
+   this->target.y = p.target.y;
    this->addr = p.addr;
 }
@@ -31 +35 @@
    this->name = name;
    this->password = password;
-   this->pos.x = 200;
-   this->pos.y = 200;
+   this->pos.x = this->target.x = 200;
+   this->pos.y = this->target.y = 200;
 }
 
@@ -40 +44 @@
    this->name = name;
    this->password = "";
-   this->pos.x = 200;
-   this->pos.y = 200;
+   this->pos.x = this->target.x = 200;
+   this->pos.y = this->target.y = 200;
    this->addr = addr;
 }
@@ -51 +55 @@
 void Player::serialize(char* buffer)
 {
-   ostringstream oss;
-
-   oss.write((char*)&(this->id), sizeof(int));
-   oss << this->name;
-   oss.write("\0", 1);
-   oss.write((char*)&(this->pos.x), sizeof(int));
-   oss.write((char*)&(this->pos.y), sizeof(int));
-
-   memcpy(buffer, oss.str().c_str(), this->name.length()+1+2*sizeof(int));
+   memcpy(buffer, &this->id, 4);
+   memcpy(buffer+4, &this->pos.x, 4);
+   memcpy(buffer+8, &this->pos.y, 4);
+   memcpy(buffer+12, &this->target.x, 4);
+   memcpy(buffer+16, &this->target.y, 4);
+   strcpy(buffer+20, this->name.c_str());
 }
 
 void Player::deserialize(char* buffer)
 {
-   istringstream iss;
-   iss.str(buffer);
+   memcpy(&this->id, buffer, 4);
+   memcpy(&this->pos.x, buffer+4, 4);
+   memcpy(&this->pos.y, buffer+8, 4);
+   memcpy(&this->target.x, buffer+12, 4);
+   memcpy(&this->target.y, buffer+16, 4);
+   this->name.assign(buffer+20);
 
-   iss.read((char*)&(this->id), sizeof(int));
-   iss >> this->name;
-   iss.read((char*)&(this->pos.x), sizeof(int));
-   iss.read((char*)&(this->pos.y), sizeof(int));
+   cout << "id: " << this->id << endl;
+   cout << "pos x: " << this->pos.x << endl;
+   cout << "pos y: " << this->pos.y << endl;
+   cout << "target x: " << this->target.x << endl;
+   cout << "target y: " << this->target.y << endl;
+   cout << "name: " << this->name << endl;
 }
 
@@ -82 +89 @@
    this->addr = addr;
 }
+
+void Player::move(void) {
+   int speed = 100; // pixels per second
+   unsigned long long curTime = getCurrentMillis();
+
+   // if we're at our target, don't move
+   if (pos.x == target.x && pos.y == target.y)
+      cout << "We're already at our target" << endl;
+   else {
+      float pixels = speed * (curTime-timeLastUpdated) / 1000.0;
+      cout << "We need to move " << pixels << " pixels" << endl;
+
+      double angle = atan2(target.y-pos.y, target.x-pos.x);
+
+      float dist = sqrt(pow(target.x-pos.x, 2) + pow(target.y-pos.y, 2));
+      if (dist <= pixels) {
+         pos.x = target.x;
+         pos.y = target.y;
+      }else {
+         pos.x += cos(angle)*pixels;
+         pos.y += sin(angle)*pixels;
+      }
+   }
+
+   timeLastUpdated = curTime;
+}

common/Player.h

@@ -32 +32 @@
    void setAddr(sockaddr_in addr);
 
+   void move();
+
    int id;
    string name;
    string password;
    sockaddr_in addr;
-   PLAYER_POS pos;
+   FLOAT_POSITION pos;
+   POSITION target;
+   unsigned long long timeLastUpdated;
 };