Merge pull request #54 from OopsOverflow/Multiplayer

Multiplayer

Author: k2d222

OpenGL/OpenGL/OpenGL.vcxproj

@@ -196,21 +196,22 @@
     <ClCompile Include="src\multiplayer\client\RealServer.cpp" />
     <ClCompile Include="src\multiplayer\common\NetworkError.cpp" />
     <ClCompile Include="src\multiplayer\common\Packet.cpp" />
+    <ClCompile Include="src\multiplayer\terrain\BiomeMap.cpp" />
+    <ClCompile Include="src\multiplayer\terrain\ChunkGenerator.cpp" />
+    <ClCompile Include="src\multiplayer\terrain\PendingChunks.cpp" />
+    <ClCompile Include="src\multiplayer\terrain\SliceMap.cpp" />
+    <ClCompile Include="src\multiplayer\terrain\Structure.cpp" />
+    <ClCompile Include="src\multiplayer\terrain\TerrainGenerator.cpp" />
     <ClCompile Include="src\noise\bitmapTex.cpp" />
     <ClCompile Include="src\noise\simplex.cpp" />
     <ClCompile Include="src\noise\value.cpp" />
     <ClCompile Include="src\noise\voronoi.cpp" />
     <ClCompile Include="src\noise\XXHash.cpp" />
     <ClCompile Include="src\save\SaveManager.cpp" />
-    <ClCompile Include="src\terrain\biomes\BiomeMap.cpp" />
     <ClCompile Include="src\terrain\BlockArray.cpp" />
     <ClCompile Include="src\terrain\Chunk.cpp" />
-    <ClCompile Include="src\terrain\ChunkGenerator.cpp" />
     <ClCompile Include="src\terrain\ChunkMap.cpp" />
     <ClCompile Include="src\terrain\SkyBox.cpp" />
-    <ClCompile Include="src\terrain\SliceMap.cpp" />
-    <ClCompile Include="src\terrain\Structure.cpp" />
-    <ClCompile Include="src\terrain\TerrainGenerator.cpp" />
     <ClCompile Include="src\terrain\World.cpp" />
     <ClCompile Include="src\ui\Button.cpp" />
     <ClCompile Include="src\ui\Component.cpp" />
@@ -236,6 +237,7 @@
     <ClInclude Include="src\blocks\Block.hpp" />
     <ClInclude Include="src\blocks\Brick_Block.hpp" />
     <ClInclude Include="src\blocks\Cactus_Block.hpp" />
+    <ClInclude Include="src\blocks\Cobalt_Block.hpp" />
     <ClInclude Include="src\blocks\Debug_Block.hpp" />
     <ClInclude Include="src\blocks\Dirt_Block.hpp" />
     <ClInclude Include="src\blocks\geometry\BlockGeometry.hpp" />
@@ -293,6 +295,13 @@
     <ClInclude Include="src\multiplayer\common\Identifier.hpp" />
     <ClInclude Include="src\multiplayer\common\NetworkError.hpp" />
     <ClInclude Include="src\multiplayer\common\Packet.hpp" />
+    <ClInclude Include="src\multiplayer\terrain\Biome.hpp" />
+    <ClInclude Include="src\multiplayer\terrain\BiomeMap.hpp" />
+    <ClInclude Include="src\multiplayer\terrain\ChunkGenerator.hpp" />
+    <ClInclude Include="src\multiplayer\terrain\PendingChunks.hpp" />
+    <ClInclude Include="src\multiplayer\terrain\SliceMap.hpp" />
+    <ClInclude Include="src\multiplayer\terrain\Structure.hpp" />
+    <ClInclude Include="src\multiplayer\terrain\TerrainGenerator.hpp" />
     <ClInclude Include="src\noise\bitmap.hpp" />
     <ClInclude Include="src\noise\bitmapTex.hpp" />
     <ClInclude Include="src\noise\DisplayNoise.hpp" />

OpenGL/OpenGL/OpenGL.vcxproj.filters

@@ -90,12 +90,6 @@
     <ClCompile Include="src\terrain\ChunkMap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\terrain\SliceMap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\terrain\Structure.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\blocks\geometry\BlockGeometry.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -105,9 +99,6 @@
     <ClCompile Include="src\blocks\geometry\TallgrassGeometry.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\terrain\biomes\BiomeMap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\blocks\geometry\WaterGeometry.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -171,16 +162,34 @@
     <ClCompile Include="src\util\Identifier.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\terrain\TerrainGenerator.cpp">
+    <ClCompile Include="src\terrain\World.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\terrain\World.cpp">
+    <ClCompile Include="src\entity\Entities.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\terrain\ChunkGenerator.cpp">
+    <ClCompile Include="src\multiplayer\terrain\ChunkGenerator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\entity\Entities.cpp">
+    <ClCompile Include="src\multiplayer\terrain\PendingChunks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\multiplayer\terrain\SliceMap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\multiplayer\terrain\Structure.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\multiplayer\terrain\TerrainGenerator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\multiplayer\terrain\BiomeMap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ui\Input.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ui\Key.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\ui\Input.cpp">
@@ -515,6 +524,9 @@
     <ClInclude Include="src\terrain\BlockArray.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\blocks\Cobalt_Block.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\multiplayer\client\ClientServer.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -533,6 +545,27 @@
     <ClInclude Include="src\entity\Entities.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\multiplayer\terrain\Biome.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\multiplayer\terrain\BiomeMap.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\multiplayer\terrain\ChunkGenerator.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\multiplayer\terrain\PendingChunks.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\multiplayer\terrain\SliceMap.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\multiplayer\terrain\Structure.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\multiplayer\terrain\TerrainGenerator.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="src\ui\Input.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -670,4 +703,4 @@
     <None Include="src\shader\skyBox.vert" />
     <None Include="src\shader\skyBox.frag" />
   </ItemGroup>
-</Project>
+</Project>

OpenGL/OpenGL/data/img/Texture_atlas.png

@@ -8,7 +8,7 @@
 #include "multiplayer/client/ClientServer.hpp"
 #include "multiplayer/client/RealServer.hpp"
 #include "multiplayer/common/Config.hpp"
-#include "terrain/TerrainGenerator.hpp"
+#include "save/SaveManager.hpp"
 
 using namespace glm;
 
@@ -50,10 +50,10 @@ void loadResources() {
     }
 }
 
-std::unique_ptr<Server> createServer() {
+std::unique_ptr<Server> createServer(Config const& config) {
     std::unique_ptr<Server> server;
-    if (!NetworkConfig::LOCAL) {
-        server = std::make_unique<RealServer>(NetworkConfig::SERVER_ADDR, NetworkConfig::SERVER_PORT);
+    if (config.multiplayer) {
+        server = std::make_unique<RealServer>(config.serverAddr, config.serverPort);
     } else {
         server = std::make_unique<ClientServer>();
     }
@@ -62,18 +62,21 @@ std::unique_ptr<Server> createServer() {
 
 int main(int argc, char* argv[]) {
     std::cout << "---- Main ----" << std::endl;
+    Config config = SaveManager::getInst().getConfig();
+
+    // game seed
+    std::hash<std::string> hashString;
+    auto seed = hashString(config.seed);
+    std::srand(seed);
+    std::cout << "seed : " << config.seed << " (" << seed << ")" << std::endl;
 
     Viewport window({800, 800});
     loadResources();
     window.createRoot();
 
-    auto server = createServer();
-    TerrainGenerator gen;
+    auto server = createServer(config);
     World& world = World::getInst();
 
-    // game seed
-    std::hash<std::string> hashString;
-    std::srand(hashString("Moncraft"));
 
     float t = 0;
 
@@ -116,7 +119,7 @@ int main(int argc, char* argv[]) {
     btn_fullscreen.setPadding({15, 10});
 
     btn_vsync.onclick([&] { window.toggleVSync(); });
-    btn_gen.onclick([&] { gen.toggleGeneration(); });
+    // btn_gen.onclick([&] { gen.toggleGeneration(); });
     btn_fullscreen.onclick([&] { window.toggleFullscreen(); });
     btn_ping.onclick([&] { server->ping(); });
 
@@ -143,7 +146,6 @@ int main(int argc, char* argv[]) {
     for (float dt = 0; window.beginFrame(dt); window.endFrame()) {
         t += dt;
 
-        gen.update(server->getPlayer()->getPosition());
         server->update();
 
         scene.drawFrame(t, dt);
@@ -153,7 +155,7 @@ int main(int argc, char* argv[]) {
         text_fps.setText(text.str());
 
         text.str(""); // "clears" the string stream
-        // text << "Player Pos : " << std::fixed << std::setprecision(3) << scene.entities->player->getPosition();
+        text << "Player Pos : " << std::fixed << std::setprecision(3) << server->getPlayer()->getPosition();
         text_posPlayer.setText(text.str());
 
         text.str(""); // "clears" the string stream

OpenGL/OpenGL/src/Application.cpp

@@ -18,7 +18,7 @@ MonCraftScene::MonCraftScene(Viewport* vp, std::shared_ptr<Character> player)
 
       fogEnabled(false),
       sunSpeed(0.0075f), skyboxSpeed(0.0075f),
-      captured(false)//, save("save/defaultWorld/entities")
+      captured(false)
 {
     // load resources
     shader = ResourceManager::getShader("simple");

OpenGL/OpenGL/src/MonCraftScene.cpp

@@ -1,10 +1,23 @@
 #include "debug/Debug.hpp"
 #include "multiplayer/server/Server.hpp"
 #include "multiplayer/common/Config.hpp"
+#include "save/SaveManager.hpp"
 
 int main() {
   std::cout << "---- Server ----" << std::endl;
-  Server server(NetworkConfig::SERVER_PORT);
+  Config config = SaveManager::getInst().getConfig();
+  
+  // game seed
+  std::hash<std::string> hashString;
+  auto seed = hashString(config.seed);
+  std::srand(seed);
+  std::cout << "seed : " << config.seed << " (" << seed << ")" << std::endl;
+
+  SaveManager::configSaveDir = "save";
+  SaveManager::configFilename = "serverConfig.txt";
+  SaveManager::entitySaveDir = "save/serverWorld/entities";
+  SaveManager::chunkSaveDir = "save/serverWorld/chunks";
+  Server server(SaveManager::getInst().getConfig().serverPort);
   server.run();
   return 0;
 }

OpenGL/OpenGL/src/Server.cpp

@@ -20,6 +20,7 @@
 #include "Birch_Leaf_Block.hpp"
 #include "Gravel_Block.hpp"
 #include "Brick_Block.hpp"
+#include "Cobalt_Block.hpp"
 
 #include <sstream>
 
@@ -34,7 +35,7 @@ class AllBlocks {
   * correctly inserted it the array.
   */
   static Block::unique_ptr_t create_static(BlockType type) {
-    static std::array<Block*(*)(), 17> factories {
+    static std::array<Block*(*)(), 18> factories {
       (Block*(*)())Air_Block::get,
       (Block*(*)())Grass_Block::get,
       (Block*(*)())Dirt_Block::get,
@@ -52,6 +53,7 @@ class AllBlocks {
       (Block*(*)())Birch_Leaf_Block::get,
       (Block*(*)())Gravel_Block::get,
       (Block*(*)())Brick_Block::get,
+      (Block*(*)())Cobalt_Block::get,
     };
     auto index = (size_t)type;
     if(index > factories.size()) {

OpenGL/OpenGL/src/blocks/AllBlocks.hpp

@@ -24,7 +24,8 @@ enum class BlockType
     Birch_Wood,
     Birch_Leaf,
     Gravel,
-    Brick
+    Brick,
+    Cobalt
 };
 
 enum class BlockFace { TOP, BOTTOM, FRONT, RIGHT, BACK, LEFT };

OpenGL/OpenGL/src/blocks/Block.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Block.hpp"
+
+class Cobalt_Block : public Block {
+public:
+    static Cobalt_Block* get() {
+      static Cobalt_Block inst;
+      return &inst;
+    }
+
+    glm::ivec2 getFaceUVs(BlockFace face) const override {
+      return {2, 3};
+    }
+
+private:
+    Cobalt_Block() : Block(BlockType::Cobalt) {}
+};

OpenGL/OpenGL/src/blocks/Cobalt_Block.hpp

@@ -5,19 +5,20 @@ using namespace glm;
 static const highp_dmat4 I(1.0);
 
 Entity::Entity(Hitbox hitbox)
-: view(View::FIRST_PERSON), state(State::Idle),
+: view(View::FIRST_PERSON),
+	state(State::Idle),
+	uid(0),
 	maxSpeed(4.3f), maxAccel(10.f), verticalFriction(0.f), horizontalFriction(5.f),
 	gravity(32.f), jumpSpeed(10.5f), maxFallSpeed(78.4f),
-	playerFovY(45.0f),
+	playerFovY(SaveManager::getInst().getConfig().fov),
+	defaultFovY(playerFovY),
 	speed(0), accel(0), direction(0),
   onFloor(false),
-	hitbox(std::move(hitbox)),
-	uid(0)
+	hitbox(std::move(hitbox))
 {}
 
 Entity::~Entity() {
-	SaveManager save("save/defaultWorld/entities");
-	save.saveEntity(*this);
+	SaveManager::saveEntity(*this);
 }
 
 void Entity::walk(vec3 dir) {
@@ -145,7 +146,12 @@ void Entity::update(float dt) {
 	  headNode.rot.y -= delta;
 	}
 
-	playerFovY = playerFovY - (playerFovY - (45.0f + length(speed) / 4.0f)) * 10.0f * dt;
+	// fov function of speed
+	const auto maxFov = 180.0;
+	const auto smoothing = 0.005f;
+	const auto transition = 10.f;
+	const auto targetFov = playerFovY - (maxFov + (defaultFovY - maxFov) * exp(-smoothing * length(speed)));
+	playerFovY = playerFovY - targetFov * transition * dt;
 
 	node.update();
 }