From 0bfeff771e69eec752739c29ff7cac5383ce28e5 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Sat, 3 Sep 2022 12:29:40 +0200 Subject: [PATCH] Formatting. --- spine-godot/spine_godot/SpineEditorPlugin.cpp | 2 +- spine-godot/spine_godot/SpineEditorPlugin.h | 6 +- .../spine_godot/SpineSkeletonFileResource.cpp | 116 +++++++++--------- spine-ts/spine-webgl/src/GLTexture.ts | 2 +- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/spine-godot/spine_godot/SpineEditorPlugin.cpp b/spine-godot/spine_godot/SpineEditorPlugin.cpp index ab97eeecc..359a702f9 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.cpp +++ b/spine-godot/spine_godot/SpineEditorPlugin.cpp @@ -90,7 +90,7 @@ Error SpineBinaryResourceImportPlugin::import(const String &source_file, const S #endif Ref skeleton_file_res(memnew(SpineSkeletonFileResource)); Error error = skeleton_file_res->load_from_file(source_file); - if (error != OK) return error; + if (error != OK) return error; String file_name = vformat("%s.%s", save_path, get_save_extension()); #if VERSION_MAJOR > 3 diff --git a/spine-godot/spine_godot/SpineEditorPlugin.h b/spine-godot/spine_godot/SpineEditorPlugin.h index 720cef48b..af6c58903 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.h +++ b/spine-godot/spine_godot/SpineEditorPlugin.h @@ -57,7 +57,7 @@ public: #if VERSION_MAJOR > 3 int get_import_order() const override { return IMPORT_ORDER_DEFAULT; } - float get_priority() const override { return 1; } + float get_priority() const override { return 1; } void get_import_options(const String &path, List *options, int preset) const override; @@ -94,7 +94,7 @@ public: #if VERSION_MAJOR > 3 int get_import_order() const override { return IMPORT_ORDER_DEFAULT; } - float get_priority() const override { return 1; } + float get_priority() const override { return 1; } void get_import_options(const String &path, List *options, int preset) const override {} @@ -131,7 +131,7 @@ public: #if VERSION_MAJOR > 3 int get_import_order() const override { return IMPORT_ORDER_DEFAULT; } - float get_priority() const override { return 1; } + float get_priority() const override { return 1; } void get_import_options(const String &path, List *options, int preset) const override {} diff --git a/spine-godot/spine_godot/SpineSkeletonFileResource.cpp b/spine-godot/spine_godot/SpineSkeletonFileResource.cpp index f9f5275c8..9b663ea68 100644 --- a/spine-godot/spine_godot/SpineSkeletonFileResource.cpp +++ b/spine-godot/spine_godot/SpineSkeletonFileResource.cpp @@ -39,93 +39,93 @@ struct BinaryInput { - const unsigned char *cursor; - const unsigned char *end; + const unsigned char *cursor; + const unsigned char *end; }; static unsigned char readByte(BinaryInput *input) { - return *input->cursor++; + return *input->cursor++; } static int readVarint(BinaryInput *input, bool optimizePositive) { - unsigned char b = readByte(input); - int value = b & 0x7F; - if (b & 0x80) { - b = readByte(input); - value |= (b & 0x7F) << 7; - if (b & 0x80) { - b = readByte(input); - value |= (b & 0x7F) << 14; - if (b & 0x80) { - b = readByte(input); - value |= (b & 0x7F) << 21; - if (b & 0x80) value |= (readByte(input) & 0x7F) << 28; - } - } - } + unsigned char b = readByte(input); + int value = b & 0x7F; + if (b & 0x80) { + b = readByte(input); + value |= (b & 0x7F) << 7; + if (b & 0x80) { + b = readByte(input); + value |= (b & 0x7F) << 14; + if (b & 0x80) { + b = readByte(input); + value |= (b & 0x7F) << 21; + if (b & 0x80) value |= (readByte(input) & 0x7F) << 28; + } + } + } - if (!optimizePositive) { - value = (((unsigned int) value >> 1) ^ -(value & 1)); - } + if (!optimizePositive) { + value = (((unsigned int) value >> 1) ^ -(value & 1)); + } - return value; + return value; } static char *readString(BinaryInput *input) { - int length = readVarint(input, true); - char *string; - if (length == 0) { - return NULL; - } - string = spine::SpineExtension::alloc(length, __FILE__, __LINE__); - memcpy(string, input->cursor, length - 1); - input->cursor += length - 1; - string[length - 1] = '\0'; - return string; + int length = readVarint(input, true); + char *string; + if (length == 0) { + return NULL; + } + string = spine::SpineExtension::alloc(length, __FILE__, __LINE__); + memcpy(string, input->cursor, length - 1); + input->cursor += length - 1; + string[length - 1] = '\0'; + return string; } void SpineSkeletonFileResource::_bind_methods() { } static bool checkVersion(const char *version) { - if (!version) return false; - char *result = (char *) (strstr(version, SPINE_VERSION_STRING) - version); - return result == 0; + if (!version) return false; + char *result = (char *) (strstr(version, SPINE_VERSION_STRING) - version); + return result == 0; } static bool checkJson(const char *jsonData) { - spine::Json json(jsonData); - spine::Json *skeleton = spine::Json::getItem(&json, "skeleton"); - if (!skeleton) return false; - const char *version = spine::Json::getString(skeleton, "spine", 0); - if (!version) return false; + spine::Json json(jsonData); + spine::Json *skeleton = spine::Json::getItem(&json, "skeleton"); + if (!skeleton) return false; + const char *version = spine::Json::getString(skeleton, "spine", 0); + if (!version) return false; - return checkVersion(version); + return checkVersion(version); } static bool checkBinary(const char *binaryData, int length) { - BinaryInput input; - input.cursor = (const unsigned char *) binaryData; - input.end = (const unsigned char *) binaryData + length; - // Skip hash - input.cursor += 8; - char *version = readString(&input); - bool result = checkVersion(version); - spine::SpineExtension::free(version, __FILE__, __LINE__); - return result; + BinaryInput input; + input.cursor = (const unsigned char *) binaryData; + input.end = (const unsigned char *) binaryData + length; + // Skip hash + input.cursor += 8; + char *version = readString(&input); + bool result = checkVersion(version); + spine::SpineExtension::free(version, __FILE__, __LINE__); + return result; } Error SpineSkeletonFileResource::load_from_file(const String &path) { Error error = OK; if (path.ends_with(".spjson") || path.ends_with(".json")) { - json = FileAccess::get_file_as_string(path, &error); - if (error != OK) return error; - if (!checkJson(json.utf8())) return ERR_INVALID_DATA; - } else { - binary = FileAccess::get_file_as_array(path, &error); - if (error != OK) return error; - if (!checkBinary((const char*)binary.ptr(), binary.size())) return ERR_INVALID_DATA; - } + json = FileAccess::get_file_as_string(path, &error); + if (error != OK) return error; + if (!checkJson(json.utf8())) return ERR_INVALID_DATA; + } else { + binary = FileAccess::get_file_as_array(path, &error); + if (error != OK) return error; + if (!checkBinary((const char *) binary.ptr(), binary.size())) return ERR_INVALID_DATA; + } return error; } diff --git a/spine-ts/spine-webgl/src/GLTexture.ts b/spine-ts/spine-webgl/src/GLTexture.ts index 380bf3c54..f3a19073b 100644 --- a/spine-ts/spine-webgl/src/GLTexture.ts +++ b/spine-ts/spine-webgl/src/GLTexture.ts @@ -68,7 +68,7 @@ export class GLTexture extends Texture implements Disposable, Restorable { } } - static usesMipMaps(filter: TextureFilter) { + static usesMipMaps (filter: TextureFilter) { switch (filter) { case TextureFilter.MipMap: case TextureFilter.MipMapLinearLinear: