Get asset store working on Linux

- Fix cursor delta on chat window close.

Author: atxi

polymer/CMakeLists.txt

@@ -31,10 +31,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 if (UNIX)
-  target_link_libraries(polymer PRIVATE glfw)
+  target_link_libraries(polymer PRIVATE glfw ${VCPKG_INSTALLED_DIR}/x64-linux/lib/libtomcrypt.a)
 elseif (WIN32)
   add_compile_definitions(WIN32_LEAN_AND_MEAN VK_USE_PLATFORM_WIN32_KHR)
-  
+
   target_link_libraries(polymer PRIVATE ../vcpkg_installed/x64-windows-static/lib/tomcrypt)
 endif()
 

polymer/asset/asset_store.cpp

@@ -118,14 +118,14 @@ void AssetStore::Initialize() {
 
   // Check local store for version descriptor file
   if (HasAsset(version_info)) {
-    char* filename = GetAbsolutePath(trans_arena, path, "versions\\%s", kVersionDescriptor);
+    char* filename = GetAbsolutePath(trans_arena, path, "versions/%s", kVersionDescriptor);
 
     ProcessVersionDescriptor(filename);
   } else {
     net_queue.PushRequest(kVersionDescriptorUrl, this, [](NetworkRequest* request, NetworkResponse* response) {
       AssetStore* store = (AssetStore*)request->userp;
 
-      char* filename = GetAbsolutePath(store->trans_arena, store->path, "versions\\%s", kVersionDescriptor);
+      char* filename = GetAbsolutePath(store->trans_arena, store->path, "versions/%s", kVersionDescriptor);
 
       response->SaveToFile(filename);
       store->ProcessVersionDescriptor(filename);
@@ -178,7 +178,7 @@ void AssetStore::ProcessVersionDescriptor(const char* path) {
       net_queue.PushRequest(url, this, [](NetworkRequest* request, NetworkResponse* response) {
         AssetStore* store = (AssetStore*)request->userp;
 
-        char* filename = GetAbsolutePath(store->trans_arena, store->path, "versions\\%s", kVersionJar);
+        char* filename = GetAbsolutePath(store->trans_arena, store->path, "versions/%s", kVersionJar);
 
         response->SaveToFile(filename);
       });
@@ -208,13 +208,13 @@ void AssetStore::ProcessVersionDescriptor(const char* path) {
       net_queue.PushRequest(url, this, [](NetworkRequest* request, NetworkResponse* response) {
         AssetStore* store = (AssetStore*)request->userp;
 
-        char* filename = GetAbsolutePath(store->trans_arena, store->path, "index\\%s", kVersionIndex);
+        char* filename = GetAbsolutePath(store->trans_arena, store->path, "index/%s", kVersionIndex);
 
         response->SaveToFile(filename);
         store->ProcessIndex(filename);
       });
     } else {
-      char* filename = GetAbsolutePath(trans_arena, this->path, "index\\%s", kVersionIndex);
+      char* filename = GetAbsolutePath(trans_arena, this->path, "index/%s", kVersionIndex);
 
       ProcessIndex(filename);
     }
@@ -275,7 +275,7 @@ void AssetStore::ProcessIndex(const char* filename) {
             AssetStore* store = (AssetStore*)request->userp;
 
             char* relative_name = request->url + kResourceApi.size;
-            char* filename = GetAbsolutePath(store->trans_arena, store->path, "objects\\%s", relative_name);
+            char* filename = GetAbsolutePath(store->trans_arena, store->path, "objects/%s", relative_name);
 
             response->SaveToFile(filename);
           });
@@ -296,14 +296,14 @@ String AssetStore::LoadObject(MemoryArena& arena, String name) {
 
     char* objects_folder = GetAbsolutePath(trans_arena, path, "objects");
     if (platform.FolderExists(objects_folder)) {
-      char* hash_folder = GetAbsolutePath(trans_arena, path, "objects\\%s", hash_str);
+      char* hash_folder = GetAbsolutePath(trans_arena, path, "objects/%s", hash_str);
 
       if (platform.FolderExists(hash_folder)) {
         char fullhash[41];
 
         hash->ToString(fullhash);
 
-        char* filename = GetAbsolutePath(trans_arena, path, "objects\\%s\\%s", hash_str, fullhash);
+        char* filename = GetAbsolutePath(trans_arena, path, "objects/%s/%s", hash_str, fullhash);
 
         return ReadEntireFile(filename, arena);
       }
@@ -324,19 +324,19 @@ bool AssetStore::HasAsset(AssetInfo& info) {
     char* versions_folder = GetAbsolutePath(trans_arena, path, "versions");
     if (!platform.FolderExists(versions_folder)) return false;
 
-    filename = GetAbsolutePath(trans_arena, path, "versions\\%s", kVersionJar);
+    filename = GetAbsolutePath(trans_arena, path, "versions/%s", kVersionJar);
   } break;
   case AssetType::VersionDescriptor: {
     char* index_folder = GetAbsolutePath(trans_arena, path, "versions");
     if (!platform.FolderExists(index_folder)) return false;
 
-    filename = GetAbsolutePath(trans_arena, path, "versions\\%s", kVersionDescriptor);
+    filename = GetAbsolutePath(trans_arena, path, "versions/%s", kVersionDescriptor);
   } break;
   case AssetType::Index: {
     char* index_folder = GetAbsolutePath(trans_arena, path, "index");
     if (!platform.FolderExists(index_folder)) return false;
 
-    filename = GetAbsolutePath(trans_arena, path, "index\\%s", kVersionIndex);
+    filename = GetAbsolutePath(trans_arena, path, "index/%s", kVersionIndex);
   } break;
   case AssetType::Object: {
     char minihash[3] = {};
@@ -349,10 +349,10 @@ bool AssetStore::HasAsset(AssetInfo& info) {
     char* objects_folder = GetAbsolutePath(trans_arena, path, "objects");
     if (!platform.FolderExists(objects_folder)) return false;
 
-    char* hash_folder = GetAbsolutePath(trans_arena, path, "objects\\%s", minihash);
+    char* hash_folder = GetAbsolutePath(trans_arena, path, "objects/%s", minihash);
     if (!platform.FolderExists(hash_folder)) return false;
 
-    filename = GetAbsolutePath(trans_arena, path, "objects\\%s\\%s", minihash, fullhash);
+    filename = GetAbsolutePath(trans_arena, path, "objects/%s/%s", minihash, fullhash);
   } break;
   default: {
   } break;
@@ -371,7 +371,7 @@ bool AssetStore::HasAsset(AssetInfo& info) {
 }
 
 char* AssetStore::GetClientPath(MemoryArena& arena) {
-  return GetAbsolutePath(arena, path, "versions\\%s", kVersionJar);
+  return GetAbsolutePath(arena, path, "versions/%s", kVersionJar);
 }
 
 } // namespace asset

polymer/platform/unix/unix_main.cpp

@@ -16,6 +16,11 @@
 #define VOLK_IMPLEMENTATION
 #include <volk.h>
 
+#include <pwd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 namespace polymer {
 
 static Polymer* g_application;
@@ -38,6 +43,15 @@ inline void ToggleCursor() {
   glfwSetInputMode(window, GLFW_CURSOR, mode);
 }
 
+static void ResetLastCursor(GLFWwindow* window) {
+  double xpos, ypos;
+
+  glfwGetCursorPos(window, &xpos, &ypos);
+
+  g_last_cursor.x = (int)xpos;
+  g_last_cursor.y = (int)ypos;
+}
+
 static void OnWindowResize(GLFWwindow* window, int width, int height) {
   g_application->renderer.invalid_swapchain = true;
 }
@@ -77,6 +91,7 @@ static void OnKeyDown(GLFWwindow* window, int key, int scancode, int action, int
       game->chat_window.ToggleDisplay();
       g_frame_chat_open = true;
       memset(&g_input, 0, sizeof(g_input));
+      ResetLastCursor(window);
     }
   } break;
   }
@@ -131,6 +146,7 @@ static void OnKeyDown(GLFWwindow* window, int key, int scancode, int action, int
       ToggleCursor();
       game->chat_window.SendInput(game->connection);
       game->chat_window.ToggleDisplay();
+      ResetLastCursor(window);
     } break;
     case GLFW_KEY_LEFT: {
       game->chat_window.MoveCursor(ui::ChatMoveDirection::Left);
@@ -227,15 +243,42 @@ static ExtensionRequest UnixGetExtensionRequest() {
 }
 
 static String UnixGetAssetStorePath(MemoryArena& arena) {
-  return {};
+  const char* homedir;
+
+  if ((homedir = getenv("HOME")) == NULL) {
+    homedir = getpwuid(getuid())->pw_dir;
+  }
+
+  if (!homedir) {
+    fprintf(stderr, "Failed to get home directory.\n");
+    exit(1);
+  }
+
+  size_t length = strlen(homedir);
+
+  const char* kAssetStoreName = "/.polymer/";
+  size_t name_length = sizeof(kAssetStoreName);
+
+  size_t total_size = length + name_length + 2;
+  char* path_storage = memory_arena_push_type_count(&arena, char, total_size);
+
+  sprintf(path_storage, "%s%s/", homedir, kAssetStoreName);
+
+  return String(path_storage, total_size);
 }
 
 static bool UnixFolderExists(const char* path) {
-  return false;
+  struct stat s = {};
+
+  if (stat(path, &s)) {
+    return false;
+  }
+
+  return (s.st_mode & S_IFDIR);
 }
 
 static bool UnixCreateFolder(const char* path) {
-  return false;
+  return mkdir(path, 0700) == 0;
 }
 
 static u8* UnixAllocate(size_t size) {