mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-20 09:29:44 +00:00
Merge branch 'main' into dev
This commit is contained in:
commit
b14fa9bde8
11 changed files with 84 additions and 9 deletions
|
|
@ -22,6 +22,8 @@ packid.binding.name="inputtype:codename"
|
|||
- a..z
|
||||
- 0..9
|
||||
- f1..f25
|
||||
- grave-accent, minus, equal, left-bracket, right-bracket, backslash
|
||||
- semicolon, apostrophe, comma, period, slash
|
||||
|
||||
## *input* library
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ packid.binding.name="inputtype:codename"
|
|||
- a..z
|
||||
- 0..9
|
||||
- f1..f25
|
||||
- grave-accent, minus, equal, left-bracket, right-bracket, backslash
|
||||
- semicolon, apostrophe, comma, period, slash
|
||||
|
||||
## Библиотека input
|
||||
|
||||
|
|
|
|||
|
|
@ -133,6 +133,9 @@ static model::Mesh load_mesh(
|
|||
if (flags == FLAG_ZLIB) {
|
||||
throw std::runtime_error("compression is not supported yet");
|
||||
}
|
||||
if (attributeCount <= 0) {
|
||||
throw std::runtime_error("mesh must have at least one attribute");
|
||||
}
|
||||
std::vector<VertexAttribute> attributes;
|
||||
for (int i = 0; i < attributeCount; i++) {
|
||||
attributes.push_back(load_attribute(reader));
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ void ModelViewer::draw(const DrawContext& pctx, const Assets& assets) {
|
|||
if (size.x <= 0 || size.y <= 0) {
|
||||
return;
|
||||
}
|
||||
fbo = std::make_unique<Framebuffer>(size.x, size.y);
|
||||
fbo = std::make_unique<Framebuffer>(size.x, size.y, true);
|
||||
}
|
||||
fbo->resize(size.x, size.y);
|
||||
{
|
||||
|
|
@ -130,7 +130,13 @@ void ModelViewer::draw(const DrawContext& pctx, const Assets& assets) {
|
|||
ctx.setViewport({size.x, size.y});
|
||||
ctx.setDepthTest(true);
|
||||
ctx.setCullFace(true);
|
||||
GLfloat clearColor[4];
|
||||
glGetFloatv(GL_COLOR_CLEAR_VALUE, clearColor);
|
||||
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
|
||||
display::clear();
|
||||
glClearColor(
|
||||
clearColor[0], clearColor[1], clearColor[2], clearColor[3]
|
||||
);
|
||||
|
||||
auto& ui3dShader = assets.require<Shader>("ui3d");
|
||||
ui3dShader.use();
|
||||
|
|
|
|||
|
|
@ -20,10 +20,29 @@ StdfsDevice::StdfsDevice(fs::path root, bool createDirectory)
|
|||
<< ": " << ec.message();
|
||||
}
|
||||
}
|
||||
absoluteRoot = fs::absolute(this->root).lexically_normal();
|
||||
if (!absoluteRoot.has_filename() && absoluteRoot.has_relative_path()) {
|
||||
absoluteRoot = absoluteRoot.parent_path();
|
||||
}
|
||||
}
|
||||
|
||||
fs::path StdfsDevice::resolve(std::string_view path) {
|
||||
return root / fs::u8path(io::path(std::string(path)).normalized().string());
|
||||
if (path.find_first_of(std::string_view("\0\\:", 3)) != std::string_view::npos) {
|
||||
throw std::runtime_error("invalid path");
|
||||
}
|
||||
fs::path rel = fs::u8path(io::path(std::string(path)).normalized().string());
|
||||
if (rel.has_root_name() || rel.has_root_directory()) {
|
||||
throw std::runtime_error("absolute paths are not allowed");
|
||||
}
|
||||
fs::path full = (absoluteRoot / rel).lexically_normal();
|
||||
fs::path inside = full.lexically_relative(absoluteRoot);
|
||||
if (inside.empty() || *inside.begin() == "..") {
|
||||
throw std::runtime_error("path escapes device root");
|
||||
}
|
||||
if (inside == ".") {
|
||||
return absoluteRoot;
|
||||
}
|
||||
return full;
|
||||
}
|
||||
|
||||
std::unique_ptr<std::ostream> StdfsDevice::write(std::string_view path) {
|
||||
|
|
@ -90,17 +109,32 @@ bool StdfsDevice::mkdirs(std::string_view path) {
|
|||
|
||||
bool StdfsDevice::remove(std::string_view path) {
|
||||
auto resolved = resolve(path);
|
||||
return fs::remove(resolved);
|
||||
if (resolved == absoluteRoot) {
|
||||
throw std::runtime_error("unable to remove device root");
|
||||
}
|
||||
std::error_code ec;
|
||||
bool removed = fs::remove(resolved, ec);
|
||||
if (ec) {
|
||||
logger.error() << "error removing " << resolved << ": " << ec.message();
|
||||
}
|
||||
return removed;
|
||||
}
|
||||
|
||||
uint64_t StdfsDevice::removeAll(std::string_view path) {
|
||||
auto resolved = resolve(path);
|
||||
if (fs::exists(resolved)) {
|
||||
logger.info() << "removeAll " << resolved;
|
||||
return fs::remove_all(resolved);
|
||||
} else {
|
||||
if (resolved == absoluteRoot) {
|
||||
throw std::runtime_error("unable to remove device root");
|
||||
}
|
||||
std::error_code ec;
|
||||
auto removed = fs::remove_all(resolved, ec);
|
||||
if (ec) {
|
||||
logger.error() << "error removing " << resolved << ": " << ec.message();
|
||||
return 0;
|
||||
}
|
||||
if (removed > 0) {
|
||||
logger.info() << "removeAll " << resolved << ": " << removed;
|
||||
}
|
||||
return removed;
|
||||
}
|
||||
|
||||
class StdfsPathsGenerator : public PathsGenerator {
|
||||
|
|
|
|||
|
|
@ -23,5 +23,6 @@ namespace io {
|
|||
std::unique_ptr<PathsGenerator> list(std::string_view path) override;
|
||||
private:
|
||||
std::filesystem::path root;
|
||||
std::filesystem::path absoluteRoot;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -152,6 +152,9 @@ std::vector<ubyte> io::read_bytes(const path& filename) {
|
|||
std::string io::read_string(const path& filename) {
|
||||
size_t size;
|
||||
auto bytes = read_bytes(filename, size);
|
||||
if (bytes == nullptr) {
|
||||
throw std::runtime_error("could not read file " + filename.string());
|
||||
}
|
||||
return std::string((const char*)bytes.get(), size);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -266,8 +266,10 @@ static int l_peek(lua::State* L, network::Network& network) {
|
|||
static int l_available(lua::State* L, network::Network& network) {
|
||||
u64id_t id = lua::tointeger(L, 1);
|
||||
|
||||
if (auto connection = network.getConnection(id, false)) {
|
||||
return lua::pushinteger(L, dynamic_cast<network::TcpConnection*>(connection)->available());
|
||||
if (auto connection = dynamic_cast<network::ReadableConnection*>(
|
||||
network.getConnection(id, false)
|
||||
)) {
|
||||
return lua::pushinteger(L, connection->available());
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -196,6 +196,10 @@ void lua::init_state(State* L, StateType stateType) {
|
|||
if (stateType == StateType::GENERATOR) {
|
||||
pushnil(L);
|
||||
setglobal(L, "ffi");
|
||||
|
||||
static const char* removed_debug[] {
|
||||
"getregistry", "getupvalue", "setupvalue", "getinfo", nullptr};
|
||||
remove_lib_funcs(L, "debug", removed_debug);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -113,6 +113,14 @@ public:
|
|||
|
||||
curl_easy_setopt(curl, CURLOPT_URL, request.url.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, request.method.c_str());
|
||||
|
||||
#if LIBCURL_VERSION_NUM >= 0x075500
|
||||
curl_easy_setopt(curl, CURLOPT_PROTOCOLS_STR, "http,https");
|
||||
curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS_STR, "http,https");
|
||||
#else
|
||||
curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
|
||||
curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
|
||||
#endif
|
||||
|
||||
curl_slist* hs = nullptr;
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,16 @@ static std::unordered_map<std::string, int> keycodes {
|
|||
{"left-super", GLFW_KEY_LEFT_SUPER},
|
||||
{"right-super", GLFW_KEY_RIGHT_SUPER},
|
||||
{"grave-accent", GLFW_KEY_GRAVE_ACCENT},
|
||||
{"minus", GLFW_KEY_MINUS},
|
||||
{"equal", GLFW_KEY_EQUAL},
|
||||
{"left-bracket", GLFW_KEY_LEFT_BRACKET},
|
||||
{"right-bracket", GLFW_KEY_RIGHT_BRACKET},
|
||||
{"backslash", GLFW_KEY_BACKSLASH},
|
||||
{"semicolon", GLFW_KEY_SEMICOLON},
|
||||
{"apostrophe", GLFW_KEY_APOSTROPHE},
|
||||
{"comma", GLFW_KEY_COMMA},
|
||||
{"period", GLFW_KEY_PERIOD},
|
||||
{"slash", GLFW_KEY_SLASH},
|
||||
{"left", GLFW_KEY_LEFT},
|
||||
{"right", GLFW_KEY_RIGHT},
|
||||
{"down", GLFW_KEY_DOWN},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue