Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-02-19 14:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mass replaced godot to pandemonium.

Browse Source
This commit is contained in:
Relintai 2022-03-23 20:46:05 +01:00
parent 174326d6c3
commit 32f148ac0c
554 changed files with 14097 additions and 13657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.clang-format
View File

@ -146,7 +146,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
# SpacesInConditionalStatement: false
# SpacesInContainerLiterals: true
# SpacesInCStyleCastParentheses: false
## Godot TODO: We'll want to use a min of 1, but we need to see how to fix
## Pandemonium TODO: We'll want to use a min of 1, but we need to see how to fix
## our comment capitalization at the same time.
SpacesInLineCommentPrefix:
Minimum: 0
@ -185,5 +185,5 @@ ObjCBlockIndentWidth: 4
### Java specific config ###
Language: Java
# BreakAfterJavaFieldAnnotations: false
JavaImportGroups: ['org.godotengine', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax']
JavaImportGroups: ['net.relintai.pandemonium', 'android', 'androidx', 'com.android', 'com.google', 'java', 'javax']
...

4
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@ -1,13 +1,13 @@
---
name: Bug report
about: Report a bug in Godot
about: Report a bug in Pandemonium
title: ''
labels: ''
assignees: ''
---
**Godot version:**
**Pandemonium version:**
**OS/device including version:**

6
.github/actions/godot-build/action.yml → .github/actions/pandemonium-build/action.yml vendored
View File

@ -1,5 +1,5 @@
name: Build Godot
description: Build Godot with the provided options.
name: Build Pandemonium
description: Build Pandemonium with the provided options.
inputs:
target:
description: The scons target (debug/release_debug/release).
@ -11,7 +11,7 @@ inputs:
description: If tests are to be built.
default: false
platform:
description: The Godot platform to build.
description: The Pandemonium platform to build.
required: false
sconsflags:
default: ""

4
.github/actions/godot-cache/action.yml → .github/actions/pandemonium-cache/action.yml vendored
View File

@ -1,5 +1,5 @@
name: Setup Godot build cache
description: Setup Godot build cache.
name: Setup Pandemonium build cache
description: Setup Pandemonium build cache.
inputs:
cache-name:
description: The cache base name (job name by default).

0
.github/actions/godot-deps/action.yml → .github/actions/pandemonium-deps/action.yml vendored
View File

6
.github/actions/upload-artifact/action.yml vendored
View File

@ -1,5 +1,5 @@
name: Upload Godot artifact
description: Upload the Godot artifact.
name: Upload Pandemonium artifact
description: Upload the Pandemonium artifact.
inputs:
name:
description: The artifact name.
@ -11,7 +11,7 @@ inputs:
runs:
using: "composite"
steps:
- name: Upload Godot Artifact
- name: Upload Pandemonium Artifact
uses: actions/upload-artifact@v2
with:
name: ${{ inputs.name }}

14
.github/workflows/android_builds.yml vendored
View File

@ -33,15 +33,15 @@ jobs:
with:
java-version: 11
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
continue-on-error: true
- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps
- name: Compilation (armv7)
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }} android_arch=armv7
platform: android
@ -49,17 +49,17 @@ jobs:
tools: false
- name: Compilation (arm64v8)
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }} android_arch=arm64v8
platform: android
target: release
tools: false
- name: Generate Godot templates
- name: Generate Pandemonium templates
run: |
cd platform/android/java
./gradlew generateGodotTemplates
./gradlew generatePandemoniumTemplates
cd ../../..
ls -l bin/

8
.github/workflows/ios_builds.yml vendored
View File

@ -20,15 +20,15 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
continue-on-error: true
- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps
- name: Compilation (armv7)
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: iphone

8
.github/workflows/javascript_builds.yml vendored
View File

@ -40,15 +40,15 @@ jobs:
run: |
emcc -v
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
continue-on-error: true
- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps
- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: javascript

12
.github/workflows/linux_builds.yml vendored
View File

@ -22,7 +22,7 @@ jobs:
cache-name: linux-editor
target: release_debug
tools: true
bin: "./bin/godot.x11.opt.tools.64"
bin: "./bin/pandemonium.x11.opt.tools.64"
artifact: true
- name: Template (target=release, tools=no)
@ -47,17 +47,17 @@ jobs:
libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev \
libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true
- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps
- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }} ${{ matrix.sconsflags }}
platform: linuxbsd
@ -67,7 +67,7 @@ jobs:
- name: Prepare artifact
if: ${{ matrix.artifact }}
run: |
strip bin/godot.*
strip bin/pandemonium.*
- name: Upload artifact
uses: ./.github/actions/upload-artifact

10
.github/workflows/macos_builds.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
cache-name: macos-editor
target: release_debug
tools: true
bin: "./bin/godot.osx.opt.tools.64"
bin: "./bin/pandemonium.osx.opt.tools.64"
- name: Template (target=release, tools=no)
cache-name: macos-template
@ -34,17 +34,17 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true
- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps
- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: osx

8
.github/workflows/server_builds.yml vendored
View File

@ -43,17 +43,17 @@ jobs:
libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev \
libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true
- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps
- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }} ${{ matrix.sconsflags }}
platform: server

10
.github/workflows/windows_builds.yml vendored
View File

@ -25,7 +25,7 @@ jobs:
cache-name: windows-editor
target: release_debug
tools: true
bin: "./bin/godot.windows.opt.tools.64.exe"
bin: "./bin/pandemonium.windows.opt.tools.64.exe"
- name: Template (target=release, tools=no)
cache-name: windows-template
@ -35,17 +35,17 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
- name: Setup Pandemonium build cache
uses: ./.github/actions/pandemonium-cache
with:
cache-name: ${{ matrix.cache-name }}
continue-on-error: true
- name: Setup python and scons
uses: ./.github/actions/godot-deps
uses: ./.github/actions/pandemonium-deps
- name: Compilation
uses: ./.github/actions/godot-build
uses: ./.github/actions/pandemonium-build
with:
sconsflags: ${{ env.SCONSFLAGS }}
platform: windows

4
.gitignore vendored
View File

@ -338,10 +338,10 @@ cscope.files
cscope.out
cscope.in.out
cscope.po.out
godot.creator.*
pandemonium.creator.*
projects/
platform/windows/godot_res.res
platform/windows/pandemonium_res.res
# Visual Studio 2017 and Visual Studio Code workspace folder
/.vs

2
README.md
View File

@ -39,7 +39,7 @@ years as an in-house engine, used to publish several work-for-hire titles.
### Binary downloads
I don't have anything (lik an official webpage) set up at the moment, but temporarily you can download binaries from the github actions tab [[here]](https://github.com/Relintai/pandemonium_engine/actions).
I don't have anything (lik an official webpage) set up at the moment, but temporarily you can download binaries from the github actions tab [[here]](https://github.com/Relintai/pandemonium_engine).
### Compiling from source

6
SConstruct
View File

@ -115,12 +115,12 @@ opts = Variables(customs, ARGUMENTS)
# Target build options
opts.Add("p", "Platform (alias for 'platform')", "")
opts.Add("platform", "Target platform (%s)" % ("|".join(platform_list),), "")
opts.Add(BoolVariable("tools", "Build the tools (a.k.a. the Godot editor)", True))
opts.Add(BoolVariable("tools", "Build the tools (a.k.a. the Pandemonium editor)", True))
opts.Add(EnumVariable("target", "Compilation target", "debug", ("debug", "release_debug", "release")))
opts.Add("arch", "Platform-dependent architecture (arm/arm64/x86/x64/mips/...)", "")
opts.Add(EnumVariable("bits", "Target platform bits", "default", ("default", "32", "64")))
opts.Add(EnumVariable("optimize", "Optimization type", "speed", ("speed", "size", "none")))
opts.Add(BoolVariable("production", "Set defaults to build Godot for use in production", False))
opts.Add(BoolVariable("production", "Set defaults to build Pandemonium for use in production", False))
opts.Add(BoolVariable("use_lto", "Use link-time optimization", False))
opts.Add(BoolVariable("use_rtti", "Use RTTI", False))
opts.Add(BoolVariable("use_exceptions", "Use exceptions", False))
@ -243,7 +243,7 @@ else:
if selected_platform in ["linux", "bsd", "linuxbsd"]:
if selected_platform == "linuxbsd":
# Alias for forward compatibility.
print('Platform "linuxbsd" is still called "x11" in Godot 3.x. Building for platform "x11".')
print('Platform "linuxbsd" is still called "x11" in Pandemonium 3.x. Building for platform "x11".')
# Alias for convenience.
selected_platform = "x11"

2
core/SCsub
View File

@ -148,7 +148,7 @@ if env["builtin_zstd"]:
env.core_sources += thirdparty_obj
# Godot source files
# Pandemonium source files
env.add_source_files(env.core_sources, "*.cpp")
env.add_source_files(env.core_sources, "script_encryption_key.gen.cpp")

4
core/bind/core_bind.cpp
View File

@ -473,9 +473,9 @@ String _OS::get_executable_path() const {
Error _OS::shell_open(String p_uri) {
if (p_uri.begins_with("res://")) {
WARN_PRINT("Attempting to open an URL with the \"res://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Godot-specific path to a system path before opening it with `OS.shell_open()`.");
WARN_PRINT("Attempting to open an URL with the \"res://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Pandemonium-specific path to a system path before opening it with `OS.shell_open()`.");
} else if (p_uri.begins_with("user://")) {
WARN_PRINT("Attempting to open an URL with the \"user://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Godot-specific path to a system path before opening it with `OS.shell_open()`.");
WARN_PRINT("Attempting to open an URL with the \"user://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Pandemonium-specific path to a system path before opening it with `OS.shell_open()`.");
}
return OS::get_singleton()->shell_open(p_uri);
};

2
core/color.cpp
View File

@ -448,7 +448,7 @@ Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) const {
return c;
}
// FIXME: Remove once Godot 3.1 has been released
// FIXME: Remove once Pandemonium 3.1 has been released
float Color::gray() const {
WARN_DEPRECATED_MSG("'Color.gray()' is deprecated and will be removed in a future version. Use 'Color.v' for a better grayscale approximation.");
return (r + g + b) / 3.0;

4
core/crypto/SCsub
View File

@ -24,7 +24,7 @@ if not has_module:
env_thirdparty.disable_warnings()
# Custom config file
env_thirdparty.Append(
CPPDEFINES=[("MBEDTLS_CONFIG_FILE", '\\"thirdparty/mbedtls/include/godot_core_mbedtls_config.h\\"')]
CPPDEFINES=[("MBEDTLS_CONFIG_FILE", '\\"thirdparty/mbedtls/include/pandemonium_core_mbedtls_config.h\\"')]
)
thirdparty_mbedtls_dir = "#thirdparty/mbedtls/library/"
thirdparty_mbedtls_sources = [
@ -34,7 +34,7 @@ if not has_module:
"md5.c",
"sha1.c",
"sha256.c",
"godot_core_mbedtls_platform.c",
"pandemonium_core_mbedtls_platform.c",
]
thirdparty_mbedtls_sources = [thirdparty_mbedtls_dir + file for file in thirdparty_mbedtls_sources]
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_mbedtls_sources)

2
core/io/file_access_pack.h
View File

@ -37,7 +37,7 @@
#include "core/print_string.h"
#include "core/set.h"
// Godot's packed file magic header ("GDPC" in ASCII).
// Pandemonium's packed file magic header ("GDPC" in ASCII).
#define PACK_HEADER_MAGIC 0x43504447
// The current packed file format version number.
#define PACK_FORMAT_VERSION 1

50
core/io/file_access_zip.cpp
View File

@ -38,7 +38,7 @@ ZipArchive *ZipArchive::instance = nullptr;
extern "C" {
static void *godot_open(void *data, const char *p_fname, int mode) {
static void *pandemonium_open(void *data, const char *p_fname, int mode) {
if (mode & ZLIB_FILEFUNC_MODE_WRITE) {
return nullptr;
}
@ -49,22 +49,22 @@ static void *godot_open(void *data, const char *p_fname, int mode) {
return f;
}
static uLong godot_read(void *data, void *fdata, void *buf, uLong size) {
static uLong pandemonium_read(void *data, void *fdata, void *buf, uLong size) {
FileAccess *f = (FileAccess *)fdata;
f->get_buffer((uint8_t *)buf, size);
return size;
}
static uLong godot_write(voidpf opaque, voidpf stream, const void *buf, uLong size) {
static uLong pandemonium_write(voidpf opaque, voidpf stream, const void *buf, uLong size) {
return 0;
}
static long godot_tell(voidpf opaque, voidpf stream) {
static long pandemonium_tell(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)stream;
return f->get_position();
}
static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
static long pandemonium_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
FileAccess *f = (FileAccess *)stream;
uint64_t pos = offset;
@ -83,7 +83,7 @@ static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
return 0;
}
static int godot_close(voidpf opaque, voidpf stream) {
static int pandemonium_close(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)stream;
if (f) {
f->close();
@ -93,16 +93,16 @@ static int godot_close(voidpf opaque, voidpf stream) {
return 0;
}
static int godot_testerror(voidpf opaque, voidpf stream) {
static int pandemonium_testerror(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)stream;
return f->get_error() != OK ? 1 : 0;
}
static voidpf godot_alloc(voidpf opaque, uInt items, uInt size) {
static voidpf pandemonium_alloc(voidpf opaque, uInt items, uInt size) {
return memalloc(items * size);
}
static void godot_free(voidpf opaque, voidpf address) {
static void pandemonium_free(voidpf opaque, voidpf address) {
memfree(address);
}
@ -122,17 +122,17 @@ unzFile ZipArchive::get_file_handle(String p_file) const {
memset(&io, 0, sizeof(io));
io.opaque = nullptr;
io.zopen_file = godot_open;
io.zread_file = godot_read;
io.zwrite_file = godot_write;
io.zopen_file = pandemonium_open;
io.zread_file = pandemonium_read;
io.zwrite_file = pandemonium_write;
io.ztell_file = godot_tell;
io.zseek_file = godot_seek;
io.zclose_file = godot_close;
io.zerror_file = godot_testerror;
io.ztell_file = pandemonium_tell;
io.zseek_file = pandemonium_seek;
io.zclose_file = pandemonium_close;
io.zerror_file = pandemonium_testerror;
io.alloc_mem = godot_alloc;
io.free_mem = godot_free;
io.alloc_mem = pandemonium_alloc;
io.free_mem = pandemonium_free;
unzFile pkg = unzOpen2(packages[file.package].filename.utf8().get_data(), &io);
ERR_FAIL_COND_V_MSG(!pkg, nullptr, "Cannot open file '" + packages[file.package].filename + "'.");
@ -158,14 +158,14 @@ bool ZipArchive::try_open_pack(const String &p_path, bool p_replace_files, uint6
memset(&io, 0, sizeof(io));
io.opaque = nullptr;
io.zopen_file = godot_open;
io.zread_file = godot_read;
io.zwrite_file = godot_write;
io.zopen_file = pandemonium_open;
io.zread_file = pandemonium_read;
io.zwrite_file = pandemonium_write;
io.ztell_file = godot_tell;
io.zseek_file = godot_seek;
io.zclose_file = godot_close;
io.zerror_file = godot_testerror;
io.ztell_file = pandemonium_tell;
io.zseek_file = pandemonium_seek;
io.zclose_file = pandemonium_close;
io.zerror_file = pandemonium_testerror;
unzFile zfile = unzOpen2(p_path.utf8().get_data(), &io);
ERR_FAIL_COND_V(!zfile, false);

4
core/io/http_client.cpp
View File

@ -191,7 +191,7 @@ Error HTTPClient::request_raw(Method p_method, const String &p_url, const Vector
// Should it add utf8 encoding?
}
if (add_uagent) {
request += "User-Agent: GodotEngine/" + String(VERSION_FULL_BUILD) + " (" + OS::get_singleton()->get_name() + ")\r\n";
request += "User-Agent: PandemoniumEngine/" + String(VERSION_FULL_BUILD) + " (" + OS::get_singleton()->get_name() + ")\r\n";
}
if (add_accept) {
request += "Accept: */*\r\n";
@ -269,7 +269,7 @@ Error HTTPClient::request(Method p_method, const String &p_url, const Vector<Str
// Should it add utf8 encoding?
}
if (add_uagent) {
request += "User-Agent: GodotEngine/" + String(VERSION_FULL_BUILD) + " (" + OS::get_singleton()->get_name() + ")\r\n";
request += "User-Agent: PandemoniumEngine/" + String(VERSION_FULL_BUILD) + " (" + OS::get_singleton()->get_name() + ")\r\n";
}
if (add_accept) {
request += "Accept: */*\r\n";

12
core/make_binders.py
View File

@ -9,11 +9,11 @@ public:
$ifret R$ $ifnoret void$ (T::*method)($arg, P@$) $ifconst const$;
#ifdef DEBUG_METHODS_ENABLED
virtual Variant::Type _gen_argument_type(int p_arg) const { return _get_argument_type(p_arg); }
virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const {
virtual PandemoniumTypeInfo::Metadata get_argument_meta(int p_arg) const {
$ifret if (p_arg==-1) return GetTypeInfo<R>::METADATA;$
$arg if (p_arg==(@-1)) return GetTypeInfo<P@>::METADATA;
$
return GodotTypeInfo::METADATA_NONE;
return PandemoniumTypeInfo::METADATA_NONE;
}
Variant::Type _get_argument_type(int p_argument) const {
$ifret if (p_argument==-1) return (Variant::Type)GetTypeInfo<R>::VARIANT_TYPE;$
@ -100,11 +100,11 @@ public:
#ifdef DEBUG_METHODS_ENABLED
virtual Variant::Type _gen_argument_type(int p_arg) const { return _get_argument_type(p_arg); }
virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const {
virtual PandemoniumTypeInfo::Metadata get_argument_meta(int p_arg) const {
$ifret if (p_arg==-1) return GetTypeInfo<R>::METADATA;$
$arg if (p_arg==(@-1)) return GetTypeInfo<P@>::METADATA;
$
return GodotTypeInfo::METADATA_NONE;
return PandemoniumTypeInfo::METADATA_NONE;
}
Variant::Type _get_argument_type(int p_argument) const {
@ -200,11 +200,11 @@ public:
$ifret R$ $ifnoret void$ (*method) ($ifconst const$ T *$ifargs , $$arg, P@$);
#ifdef DEBUG_METHODS_ENABLED
virtual Variant::Type _gen_argument_type(int p_arg) const { return _get_argument_type(p_arg); }
virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const {
virtual PandemoniumTypeInfo::Metadata get_argument_meta(int p_arg) const {
$ifret if (p_arg==-1) return GetTypeInfo<R>::METADATA;$
$arg if (p_arg==(@-1)) return GetTypeInfo<P@>::METADATA;
$
return GodotTypeInfo::METADATA_NONE;
return PandemoniumTypeInfo::METADATA_NONE;
}
Variant::Type _get_argument_type(int p_argument) const {
$ifret if (p_argument==-1) return (Variant::Type)GetTypeInfo<R>::VARIANT_TYPE;$

14
core/math/convex_hull.cpp
View File

@ -2,7 +2,7 @@
/* convex_hull.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* PANDEMONIUM ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
@ -29,7 +29,7 @@
/*************************************************************************/
/*
* Based on Godot's patched VHACD-version of Bullet's btConvexHullComputer.
* Based on Pandemonium's patched VHACD-version of Bullet's btConvexHullComputer.
* See /thirdparty/vhacd/btConvexHullComputer.cpp at 64403ddcab9f1dca2408f0a412a22d899708bbb1
* In turn, based on /src/LinearMath/btConvexHullComputer.cpp in <https://github.com/bulletphysics/bullet3>
* at 73b217fb07e7e3ce126caeb28ab3c9ddd0718467
@ -37,8 +37,8 @@
* Changes:
* - int32_t is consistently used instead of int in some cases
* - integrated patch db0d6c92927f5a1358b887f2645c11f3014f0e8a from Bullet (CWE-190 integer overflow in btConvexHullComputer)
* - adapted to Godot's code style
* - replaced Bullet's types (e.g. vectors) with Godot's
* - adapted to Pandemonium's code style
* - replaced Bullet's types (e.g. vectors) with Pandemonium's
* - replaced custom Pool implementation with PagedAllocator
*/
@ -69,10 +69,10 @@ subject to the following restrictions:
//#define DEBUG_CONVEX_HULL
//#define SHOW_ITERATIONS
// -- GODOT start --
// -- PANDEMONIUM start --
// Assembly optimizations are not used at the moment.
//#define USE_X86_64_ASM
// -- GODOT end --
// -- PANDEMONIUM end --
#ifdef DEBUG_ENABLED
#define CHULL_ASSERT(m_cond) \
@ -2288,7 +2288,7 @@ Error ConvexHullComputer::convex_hull(const Vector3 *p_points, int32_t p_point_c
e = e->get_next_edge_of_face();
} while (e != e_start);
// reverse indices: Godot wants clockwise, but this is counter-clockwise
// reverse indices: Pandemonium wants clockwise, but this is counter-clockwise
if (face.indices.size() > 2) {
// reverse all but the first index.
int *indices = face.indices.ptrw();

6
core/math/transform_interpolator.cpp
View File

@ -167,7 +167,7 @@ void TransformInterpolator::interpolate_basis_linear(const Basis &p_prev, const
r_result = p_prev.lerp(p_curr, p_fraction);
// It turns out we need to guard against zero scale basis.
// This is kind of silly, as we should probably fix the bugs elsewhere in Godot that can't deal with
// This is kind of silly, as we should probably fix the bugs elsewhere in Pandemonium that can't deal with
// zero scale, but until that time...
for (int n = 0; n < 3; n++) {
Vector3 &axis = r_result[n];
@ -279,7 +279,7 @@ TransformInterpolator::Method TransformInterpolator::_test_basis(Basis p_basis,
r_needed_normalize = true;
}
// Apply less stringent tests than the built in slerp, the standard Godot slerp
// Apply less stringent tests than the built in slerp, the standard Pandemonium slerp
// is too susceptible to float error to be useful
real_t det = p_basis.determinant();
if (!Math::is_equal_approx(det, 1, (real_t)0.01f)) {
@ -334,7 +334,7 @@ bool TransformInterpolator::_basis_is_orthogonal(const Basis &p_basis, real_t p_
Basis identity;
Basis m = p_basis * p_basis.transposed();
// Less stringent tests than the standard Godot slerp
// Less stringent tests than the standard Pandemonium slerp
if (!m[0].is_equal_approx(identity[0], p_epsilon) || !m[1].is_equal_approx(identity[1], p_epsilon) || !m[2].is_equal_approx(identity[2], p_epsilon)) {
return false;
}

6
core/method_bind.h
View File

@ -262,7 +262,7 @@ public:
void set_argument_names(const Vector<StringName> &p_names); //set by class, db, can't be inferred otherwise
Vector<StringName> get_argument_names() const;
virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const = 0;
virtual PandemoniumTypeInfo::Metadata get_argument_meta(int p_arg) const = 0;
#endif
void set_hint_flags(uint32_t p_hint) { hint_flags = p_hint; }
@ -319,8 +319,8 @@ public:
return _gen_argument_type_info(p_arg).type;
}
virtual GodotTypeInfo::Metadata get_argument_meta(int) const {
return GodotTypeInfo::METADATA_NONE;
virtual PandemoniumTypeInfo::Metadata get_argument_meta(int) const {
return PandemoniumTypeInfo::METADATA_NONE;
}
#else

4
core/os/os.cpp
View File

@ -317,7 +317,7 @@ String OS::get_safe_dir_name(const String &p_dir_name, bool p_allow_dir_separato
// Path to data, config, cache, etc. OS-specific folders
// Get properly capitalized engine name for system paths
String OS::get_godot_dir_name() const {
String OS::get_pandemonium_dir_name() const {
// Default to lowercase, so only override when different case is needed
return String(VERSION_SHORT_NAME).to_lower();
}
@ -838,7 +838,7 @@ OS::OS() {
restart_on_exit = false;
singleton = this;
_keep_screen_on = true; // set default value to true, because this had been true before godot 2.0.
_keep_screen_on = true; // set default value to true, because this had been true before pandemonium 2.0.
low_processor_usage_mode = false;
low_processor_usage_mode_sleep_usec = 10000;
_update_vital_only = false;

2
core/os/os.h
View File

@ -458,7 +458,7 @@ public:
String get_locale_language() const;
String get_safe_dir_name(const String &p_dir_name, bool p_allow_dir_separator = false) const;
virtual String get_godot_dir_name() const;
virtual String get_pandemonium_dir_name() const;
virtual String get_data_path() const;
virtual String get_config_path() const;

36
core/project_settings.cpp
View File

@ -311,7 +311,7 @@ void ProjectSettings::_convert_to_last_version(int p_from_version) {
}
/*
* This method is responsible for loading a project.godot file and/or data file
* This method is responsible for loading a project.pandemonium file and/or data file
* using the following merit order:
* - If using NetworkClient, try to lookup project file or fail.
* - If --main-pack was passed by the user (`p_main_pack`), load it or fail.
@ -339,7 +339,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
// If looking for files in a network client, use it directly
if (FileAccessNetworkClient::get_singleton()) {
Error err = _load_settings_text_or_binary("res://project.godot", "res://project.binary");
Error err = _load_settings_text_or_binary("res://project.pandemonium", "res://project.binary");
if (err == OK && !p_ignore_override) {
// Optional, we don't mind if it fails
_load_settings_text("res://override.cfg");
@ -353,7 +353,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
bool ok = _load_resource_pack(p_main_pack);
ERR_FAIL_COND_V_MSG(!ok, ERR_CANT_OPEN, "Cannot open resource pack '" + p_main_pack + "'.");
Error err = _load_settings_text_or_binary("res://project.godot", "res://project.binary");
Error err = _load_settings_text_or_binary("res://project.pandemonium", "res://project.binary");
if (err == OK && !p_ignore_override) {
// Load override from location of the main pack
// Optional, we don't mind if it fails
@ -372,7 +372,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
bool found = _load_resource_pack(exec_path);
// Attempt with exec_name.pck.
// (This is the usual case when distributing a Godot game.)
// (This is the usual case when distributing a Pandemonium game.)
String exec_dir = exec_path.get_base_dir();
String exec_filename = exec_path.get_file();
String exec_basename = exec_filename.get_basename();
@ -403,7 +403,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
// If we opened our package, try and load our project.
if (found) {
Error err = _load_settings_text_or_binary("res://project.godot", "res://project.binary");
Error err = _load_settings_text_or_binary("res://project.pandemonium", "res://project.binary");
if (err == OK && !p_ignore_override) {
// Load override from location of the executable.
// Optional, we don't mind if it fails.
@ -424,7 +424,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
resource_path = resource_path.substr(0, resource_path.length() - 1); // Chop end.
}
Error err = _load_settings_text_or_binary("res://project.godot", "res://project.binary");
Error err = _load_settings_text_or_binary("res://project.pandemonium", "res://project.binary");
if (err == OK && !p_ignore_override) {
// Optional, we don't mind if it fails.
_load_settings_text("res://override.cfg");
@ -445,7 +445,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
Error err;
while (true) {
err = _load_settings_text_or_binary(current_dir.plus_file("project.godot"), current_dir.plus_file("project.binary"));
err = _load_settings_text_or_binary(current_dir.plus_file("project.pandemonium"), current_dir.plus_file("project.binary"));
if (err == OK && !p_ignore_override) {
// Optional, we don't mind if it fails.
_load_settings_text(current_dir.plus_file("override.cfg"));
@ -586,10 +586,10 @@ Error ProjectSettings::_load_settings_text(const String &p_path) {
err = VariantParser::parse_tag_assign_eof(&stream, lines, error_text, next_tag, assign, value, nullptr, true);
if (err == ERR_FILE_EOF) {
memdelete(f);
// If we're loading a project.godot from source code, we can operate some
// If we're loading a project.pandemonium from source code, we can operate some
// ProjectSettings conversions if need be.
_convert_to_last_version(config_version);
last_save_time = FileAccess::get_modified_time(get_resource_path().plus_file("project.godot"));
last_save_time = FileAccess::get_modified_time(get_resource_path().plus_file("project.pandemonium"));
return OK;
} else if (err != OK) {
ERR_PRINT("Error parsing " + p_path + " at line " + itos(lines) + ": " + error_text + " File might be corrupted.");
@ -618,7 +618,7 @@ Error ProjectSettings::_load_settings_text(const String &p_path) {
}
Error ProjectSettings::_load_settings_text_or_binary(const String &p_text_path, const String &p_bin_path) {
// Attempt first to load the binary project.godot file.
// Attempt first to load the binary project.pandemonium file.
Error err = _load_settings_binary(p_bin_path);
if (err == OK) {
return OK;
@ -627,7 +627,7 @@ Error ProjectSettings::_load_settings_text_or_binary(const String &p_text_path,
ERR_PRINT("Couldn't load file '" + p_bin_path + "', error code " + itos(err) + ".");
}
// Fallback to text-based project.godot file if binary was not found.
// Fallback to text-based project.pandemonium file if binary was not found.
err = _load_settings_text(p_text_path);
if (err == OK) {
return OK;
@ -661,9 +661,9 @@ void ProjectSettings::clear(const String &p_name) {
}
Error ProjectSettings::save() {
Error error = save_custom(get_resource_path().plus_file("project.godot"));
Error error = save_custom(get_resource_path().plus_file("project.pandemonium"));
if (error == OK) {
last_save_time = FileAccess::get_modified_time(get_resource_path().plus_file("project.godot"));
last_save_time = FileAccess::get_modified_time(get_resource_path().plus_file("project.pandemonium"));
}
return error;
}
@ -757,7 +757,7 @@ Error ProjectSettings::_save_settings_text(const String &p_file, const Map<Strin
Error err;
FileAccess *file = FileAccess::open(p_file, FileAccess::WRITE, &err);
ERR_FAIL_COND_V_MSG(err != OK, err, "Couldn't save project.godot - " + p_file + ".");
ERR_FAIL_COND_V_MSG(err != OK, err, "Couldn't save project.pandemonium - " + p_file + ".");
file->store_line("; Engine configuration file.");
file->store_line("; It's best edited using the editor UI and not directly,");
@ -881,7 +881,7 @@ Error ProjectSettings::save_custom(const String &p_path, const CustomMap &p_cust
custom_features += f;
}
if (p_path.ends_with(".godot") || p_path.ends_with("override.cfg")) {
if (p_path.ends_with(".pandemonium") || p_path.ends_with("override.cfg")) {
return _save_settings_text(p_path, props, p_custom, custom_features);
} else if (p_path.ends_with(".binary")) {
return _save_settings_binary(p_path, props, p_custom, custom_features);
@ -1019,7 +1019,7 @@ void ProjectSettings::_bind_methods() {
ProjectSettings::ProjectSettings() {
// Initialization of engine variables should be done in the setup() method,
// so that the values can be overridden from project.godot or project.binary.
// so that the values can be overridden from project.pandemonium or project.binary.
singleton = this;
last_order = NO_BUILTIN_ORDER_BASE;
@ -1047,7 +1047,7 @@ ProjectSettings::ProjectSettings() {
PoolStringArray extensions = PoolStringArray();
extensions.push_back("gd");
if (Engine::get_singleton()->has_singleton("GodotSharp")) {
if (Engine::get_singleton()->has_singleton("PandemoniumSharp")) {
extensions.push_back("cs");
}
extensions.push_back("gdshader");
@ -1227,7 +1227,7 @@ ProjectSettings::ProjectSettings() {
custom_prop_info["physics/2d/thread_model"] = PropertyInfo(Variant::INT, "physics/2d/thread_model", PROPERTY_HINT_ENUM, "Single-Unsafe,Single-Safe,Multi-Threaded");
custom_prop_info["rendering/quality/intended_usage/framebuffer_allocation"] = PropertyInfo(Variant::INT, "rendering/quality/intended_usage/framebuffer_allocation", PROPERTY_HINT_ENUM, "2D,2D Without Sampling,3D,3D Without Effects");
// Required to make the project setting appear even if the physics engine is GodotPhysics,
// Required to make the project setting appear even if the physics engine is PandemoniumPhysics,
// while also making it appear in the ProjectSettings class documentation.
GLOBAL_DEF("physics/3d/smooth_trimesh_collision", false);

4
core/project_settings.h
View File

@ -39,7 +39,7 @@
// instead of Querying all the strings every frame just in case of changes,
// there is a signal "project_settings_changed" which objects can subscribe to.
// E.g. (from another Godot object)
// E.g. (from another Pandemonium object)
// // Call your user written object function to Query the project settings once at creation,
// perhaps in an ENTER_TREE notification:
// _project_settings_changed()
@ -55,7 +55,7 @@
// before ProjectSettings:
// ProjectSettings::get_singleton()->disconnect("project_settings_changed", this, "_project_settings_changed");
// Additionally, for objects that are not regular Godot objects capable of subscribing to signals (e.g. Rasterizers),
// Additionally, for objects that are not regular Pandemonium objects capable of subscribing to signals (e.g. Rasterizers),
// you can also query the function "has_changes()" each frame,
// and update your local settings whenever this is set.

4
core/reference.h
View File

@ -338,7 +338,7 @@ struct PtrToArg<const RefPtr &> {
template <class T>
struct GetTypeInfo<Ref<T>> {
static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE;
static inline PropertyInfo get_class_info() {
return PropertyInfo(Variant::OBJECT, String(), PROPERTY_HINT_RESOURCE_TYPE, T::get_class_static());
@ -348,7 +348,7 @@ struct GetTypeInfo<Ref<T>> {
template <class T>
struct GetTypeInfo<const Ref<T> &> {
static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE;
static inline PropertyInfo get_class_info() {
return PropertyInfo(Variant::OBJECT, String(), PROPERTY_HINT_RESOURCE_TYPE, T::get_class_static());

2
core/rid_handle.cpp
View File

@ -223,7 +223,7 @@ RID_Data *RID_Database::handle_getptr(const RID &p_rid) {
}
// Note, no locks used in the getters.
// Godot 4.x does use locks in the getters, but it is arguably overkill because even though
// Pandemonium 4.x does use locks in the getters, but it is arguably overkill because even though
// the pointer returned will be correct (i.e. it has not been replaced during this call),
// it can be invalidated during the client code use. (There may also be an internal reason why
// locks are needed in 4.x, as the database is different.)

8
core/string_builder.cpp
View File

@ -65,19 +65,19 @@ String StringBuilder::as_string() const {
int current_position = 0;
int godot_string_elem = 0;
int pandemonium_string_elem = 0;
int c_string_elem = 0;
for (int i = 0; i < appended_strings.size(); i++) {
if (appended_strings[i] == -1) {
// Godot string
const String &s = strings[godot_string_elem];
// Pandemonium string
const String &s = strings[pandemonium_string_elem];
memcpy(buffer + current_position, s.ptr(), s.length() * sizeof(CharType));
current_position += s.length();
godot_string_elem++;
pandemonium_string_elem++;
} else {
const char *s = c_strings[c_string_elem];

2
core/string_builder.h
View File

@ -40,7 +40,7 @@ class StringBuilder {
Vector<String> strings;
Vector<const char *> c_strings;
// -1 means it's a Godot String
// -1 means it's a Pandemonium String
// a natural number means C string.
Vector<int32_t> appended_strings;

48
core/type_info.h
View File

@ -62,7 +62,7 @@ struct TypeInherits {
!TypesAreSame<B volatile const, void volatile const>::value;
};
namespace GodotTypeInfo {
namespace PandemoniumTypeInfo {
enum Metadata {
METADATA_NONE,
METADATA_INT_IS_INT8,
@ -90,7 +90,7 @@ struct GetTypeInfo;
template <> \
struct GetTypeInfo<m_type> { \
static const Variant::Type VARIANT_TYPE = m_var_type; \
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE; \
static inline PropertyInfo get_class_info() { \
return PropertyInfo(VARIANT_TYPE, String()); \
} \
@ -98,7 +98,7 @@ struct GetTypeInfo;
template <> \
struct GetTypeInfo<const m_type &> { \
static const Variant::Type VARIANT_TYPE = m_var_type; \
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE; \
static inline PropertyInfo get_class_info() { \
return PropertyInfo(VARIANT_TYPE, String()); \
} \
@ -108,7 +108,7 @@ struct GetTypeInfo;
template <> \
struct GetTypeInfo<m_type> { \
static const Variant::Type VARIANT_TYPE = m_var_type; \
static const GodotTypeInfo::Metadata METADATA = m_metadata; \
static const PandemoniumTypeInfo::Metadata METADATA = m_metadata; \
static inline PropertyInfo get_class_info() { \
return PropertyInfo(VARIANT_TYPE, String()); \
} \
@ -116,24 +116,24 @@ struct GetTypeInfo;
template <> \
struct GetTypeInfo<const m_type &> { \
static const Variant::Type VARIANT_TYPE = m_var_type; \
static const GodotTypeInfo::Metadata METADATA = m_metadata; \
static const PandemoniumTypeInfo::Metadata METADATA = m_metadata; \
static inline PropertyInfo get_class_info() { \
return PropertyInfo(VARIANT_TYPE, String()); \
} \
};
MAKE_TYPE_INFO(bool, Variant::BOOL)
MAKE_TYPE_INFO_WITH_META(uint8_t, Variant::INT, GodotTypeInfo::METADATA_INT_IS_UINT8)
MAKE_TYPE_INFO_WITH_META(int8_t, Variant::INT, GodotTypeInfo::METADATA_INT_IS_INT8)
MAKE_TYPE_INFO_WITH_META(uint16_t, Variant::INT, GodotTypeInfo::METADATA_INT_IS_UINT16)
MAKE_TYPE_INFO_WITH_META(int16_t, Variant::INT, GodotTypeInfo::METADATA_INT_IS_INT16)
MAKE_TYPE_INFO_WITH_META(uint32_t, Variant::INT, GodotTypeInfo::METADATA_INT_IS_UINT32)
MAKE_TYPE_INFO_WITH_META(int32_t, Variant::INT, GodotTypeInfo::METADATA_INT_IS_INT32)
MAKE_TYPE_INFO_WITH_META(uint64_t, Variant::INT, GodotTypeInfo::METADATA_INT_IS_UINT64)
MAKE_TYPE_INFO_WITH_META(int64_t, Variant::INT, GodotTypeInfo::METADATA_INT_IS_INT64)
MAKE_TYPE_INFO_WITH_META(uint8_t, Variant::INT, PandemoniumTypeInfo::METADATA_INT_IS_UINT8)
MAKE_TYPE_INFO_WITH_META(int8_t, Variant::INT, PandemoniumTypeInfo::METADATA_INT_IS_INT8)
MAKE_TYPE_INFO_WITH_META(uint16_t, Variant::INT, PandemoniumTypeInfo::METADATA_INT_IS_UINT16)
MAKE_TYPE_INFO_WITH_META(int16_t, Variant::INT, PandemoniumTypeInfo::METADATA_INT_IS_INT16)
MAKE_TYPE_INFO_WITH_META(uint32_t, Variant::INT, PandemoniumTypeInfo::METADATA_INT_IS_UINT32)
MAKE_TYPE_INFO_WITH_META(int32_t, Variant::INT, PandemoniumTypeInfo::METADATA_INT_IS_INT32)
MAKE_TYPE_INFO_WITH_META(uint64_t, Variant::INT, PandemoniumTypeInfo::METADATA_INT_IS_UINT64)
MAKE_TYPE_INFO_WITH_META(int64_t, Variant::INT, PandemoniumTypeInfo::METADATA_INT_IS_INT64)
MAKE_TYPE_INFO(wchar_t, Variant::INT)
MAKE_TYPE_INFO_WITH_META(float, Variant::REAL, GodotTypeInfo::METADATA_REAL_IS_FLOAT)
MAKE_TYPE_INFO_WITH_META(double, Variant::REAL, GodotTypeInfo::METADATA_REAL_IS_DOUBLE)
MAKE_TYPE_INFO_WITH_META(float, Variant::REAL, PandemoniumTypeInfo::METADATA_REAL_IS_FLOAT)
MAKE_TYPE_INFO_WITH_META(double, Variant::REAL, PandemoniumTypeInfo::METADATA_REAL_IS_DOUBLE)
MAKE_TYPE_INFO(String, Variant::STRING)
MAKE_TYPE_INFO(Vector2, Variant::VECTOR2)
@ -173,7 +173,7 @@ MAKE_TYPE_INFO(BSP_Tree, Variant::DICTIONARY)
template <>
struct GetTypeInfo<RefPtr> {
static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE;
static inline PropertyInfo get_class_info() {
return PropertyInfo(Variant::OBJECT, String(), PROPERTY_HINT_RESOURCE_TYPE, "Reference");
}
@ -181,7 +181,7 @@ struct GetTypeInfo<RefPtr> {
template <>
struct GetTypeInfo<const RefPtr &> {
static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE;
static inline PropertyInfo get_class_info() {
return PropertyInfo(Variant::OBJECT, String(), PROPERTY_HINT_RESOURCE_TYPE, "Reference");
}
@ -191,7 +191,7 @@ struct GetTypeInfo<const RefPtr &> {
template <>
struct GetTypeInfo<Variant> {
static const Variant::Type VARIANT_TYPE = Variant::NIL;
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE;
static inline PropertyInfo get_class_info() {
return PropertyInfo(Variant::NIL, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT);
}
@ -200,7 +200,7 @@ struct GetTypeInfo<Variant> {
template <>
struct GetTypeInfo<const Variant &> {
static const Variant::Type VARIANT_TYPE = Variant::NIL;
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE;
static inline PropertyInfo get_class_info() {
return PropertyInfo(Variant::NIL, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT);
}
@ -210,7 +210,7 @@ struct GetTypeInfo<const Variant &> {
template <> \
struct GetTypeInfo<m_template<m_type>> { \
static const Variant::Type VARIANT_TYPE = m_var_type; \
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE; \
static inline PropertyInfo get_class_info() { \
return PropertyInfo(VARIANT_TYPE, String()); \
} \
@ -218,7 +218,7 @@ struct GetTypeInfo<const Variant &> {
template <> \
struct GetTypeInfo<const m_template<m_type> &> { \
static const Variant::Type VARIANT_TYPE = m_var_type; \
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE; \
static inline PropertyInfo get_class_info() { \
return PropertyInfo(VARIANT_TYPE, String()); \
} \
@ -245,7 +245,7 @@ MAKE_TEMPLATE_TYPE_INFO(PoolVector, Face3, Variant::POOL_VECTOR3_ARRAY)
template <typename T>
struct GetTypeInfo<T *, typename EnableIf<TypeInherits<Object, T>::value>::type> {
static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE;
static inline PropertyInfo get_class_info() {
return PropertyInfo(StringName(T::get_class_static()));
}
@ -254,7 +254,7 @@ struct GetTypeInfo<T *, typename EnableIf<TypeInherits<Object, T>::value>::type>
template <typename T>
struct GetTypeInfo<const T *, typename EnableIf<TypeInherits<Object, T>::value>::type> {
static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE;
static inline PropertyInfo get_class_info() {
return PropertyInfo(StringName(T::get_class_static()));
}
@ -264,7 +264,7 @@ struct GetTypeInfo<const T *, typename EnableIf<TypeInherits<Object, T>::value>:
template <> \
struct GetTypeInfo<m_impl> { \
static const Variant::Type VARIANT_TYPE = Variant::INT; \
static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
static const PandemoniumTypeInfo::Metadata METADATA = PandemoniumTypeInfo::METADATA_NONE; \
static inline PropertyInfo get_class_info() { \
return PropertyInfo(Variant::INT, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_ENUM, String(#m_enum).replace("::", ".")); \
} \

2
core/ustring.cpp
View File

@ -2964,7 +2964,7 @@ String String::format(const Variant &values, String placeholder) const {
for (int i = 0; i < values_arr.size(); i++) {
String i_as_str = String::num_int64(i);
if (values_arr[i].get_type() == Variant::ARRAY) { //Array in Array structure [["name","RobotGuy"],[0,"godot"],["strength",9000.91]]
if (values_arr[i].get_type() == Variant::ARRAY) { //Array in Array structure [["name","RobotGuy"],[0,"pandemonium"],["strength",9000.91]]
Array value_arr = values_arr[i];
if (value_arr.size() == 2) {

4
core/variant_parser.cpp
View File

@ -431,7 +431,7 @@ Error VariantParser::_parse_enginecfg(Stream *p_stream, Vector<String> &strings,
Token token;
get_token(p_stream, token, line, r_err_str);
if (token.type != TK_PARENTHESIS_OPEN) {
r_err_str = "Expected '(' in old-style project.godot construct";
r_err_str = "Expected '(' in old-style project.pandemonium construct";
return ERR_PARSE_ERROR;
}
@ -441,7 +441,7 @@ Error VariantParser::_parse_enginecfg(Stream *p_stream, Vector<String> &strings,
CharType c = p_stream->get_char();
if (p_stream->is_eof()) {
r_err_str = "Unexpected EOF while parsing old-style project.godot construct";
r_err_str = "Unexpected EOF while parsing old-style project.pandemonium construct";
return ERR_PARSE_ERROR;
}

14
core/version.h
View File

@ -1,5 +1,5 @@
#ifndef GODOT_VERSION_H
#define GODOT_VERSION_H
#ifndef PANDEMONIUM_VERSION_H
#define PANDEMONIUM_VERSION_H
/*************************************************************************/
/* version.h */
/*************************************************************************/
@ -32,7 +32,7 @@
#include "core/version_generated.gen.h"
// Godot versions are of the form <major>.<minor> for the initial release,
// Pandemonium versions are of the form <major>.<minor> for the initial release,
// and then <major>.<minor>.<patch> for subsequent bugfix releases where <patch> != 0
// That's arbitrary, but we find it pretty and it's the current policy.
@ -53,7 +53,7 @@
// Example: 3.1.4 will be 0x030104, making comparison easy from script.
#define VERSION_HEX 0x10000 * VERSION_MAJOR + 0x100 * VERSION_MINOR + VERSION_PATCH
// Describes the full configuration of that Godot version, including the version number,
// Describes the full configuration of that Pandemonium version, including the version number,
// the status (beta, stable, etc.) and potential module-specific features (e.g. mono).
// Example: "3.1.4.stable.mono"
#define VERSION_FULL_CONFIG "" VERSION_NUMBER "." VERSION_STATUS VERSION_MODULE_CONFIG
@ -63,11 +63,11 @@
// Example: "3.1.4.stable.mono.official"
#define VERSION_FULL_BUILD "" VERSION_FULL_CONFIG "." VERSION_BUILD
// Same as above, but prepended with Godot's name and a cosmetic "v" for "version".
// Example: "Godot v3.1.4.stable.official.mono"
// Same as above, but prepended with Pandemonium's name and a cosmetic "v" for "version".
// Example: "Pandemonium v3.1.4.stable.official.mono"
#define VERSION_FULL_NAME "" VERSION_NAME " v" VERSION_FULL_BUILD
// Git commit hash, generated at build time in `core/version_hash.gen.cpp`.
extern const char *const VERSION_HASH;
#endif // GODOT_VERSION_H
#endif // PANDEMONIUM_VERSION_H

2
doc/Doxyfile
View File

@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.
PROJECT_NAME = Godot
PROJECT_NAME = Pandemonium
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version

2
doc/tools/make_rst.py
View File

@ -461,7 +461,7 @@ def make_rst_class(class_def, state, dry_run, output_dir): # type: (ClassDef, S
# Warn contributors not to edit this file directly
f.write(":github_url: hide\n\n")
f.write(".. Generated automatically by doc/tools/make_rst.py in Godot's source tree.\n")
f.write(".. Generated automatically by doc/tools/make_rst.py in Pandemonium's source tree.\n")
f.write(".. DO NOT EDIT THIS FILE, but the " + class_name + ".xml source instead.\n")
f.write(".. The source is found in doc/classes or modules/<name>/doc_classes.\n\n")

500
doc/translations/classes.pot
View File

File diff suppressed because it is too large Load Diff

2
doc/translations/extract.py
View File

@ -18,7 +18,7 @@ HEADER = """\
msgid ""
msgstr ""
"Project-Id-Version: Godot Engine class reference\\n"
"Report-Msgid-Bugs-To: https://github.com/godotengine/godot\\n"
"Report-Msgid-Bugs-To: https://github.com/Relintai/pandemonium\\n"
"MIME-Version: 1.0\\n"
"Content-Type: text/plain; charset=UTF-8\\n"
"Content-Transfer-Encoding: 8-bit\\n"

4
drivers/alsa/asound-so_wrap.c
View File

@ -1,7 +1,7 @@
// This file is generated. Do not edit!
// see https://github.com/hpvb/dynload-wrapper for details
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.3 on 2021-02-22 19:22:12
// flags: /home/hp/Projects/godot/pulse/generate-wrapper.py --include /usr/include/alsa/asoundlib.h --sys-include <alsa/asoundlib.h> --soname libasound.so.2 --init-name asound --omit-prefix snd_pcm_sw_params_set_tstamp_type --omit-prefix snd_pcm_status_get_audio_htstamp_report --omit-prefix snd_pcm_sw_params_get_tstamp_type --omit-prefix snd_pcm_status_set_audio_htstamp_config --output-header asound-so_wrap.h --output-implementation asound-so_wrap.c
// generated by /home/hp/Projects/pandemonium/pulse/generate-wrapper.py 0.3 on 2021-02-22 19:22:12
// flags: /home/hp/Projects/pandemonium/pulse/generate-wrapper.py --include /usr/include/alsa/asoundlib.h --sys-include <alsa/asoundlib.h> --soname libasound.so.2 --init-name asound --omit-prefix snd_pcm_sw_params_set_tstamp_type --omit-prefix snd_pcm_status_get_audio_htstamp_report --omit-prefix snd_pcm_sw_params_get_tstamp_type --omit-prefix snd_pcm_status_set_audio_htstamp_config --output-header asound-so_wrap.h --output-implementation asound-so_wrap.c
//
#include <stdint.h>

4
drivers/alsa/asound-so_wrap.h
View File

@ -2,8 +2,8 @@
#define DYLIBLOAD_WRAPPER_ASOUND
// This file is generated. Do not edit!
// see https://github.com/hpvb/dynload-wrapper for details
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.3 on 2021-02-22 19:22:12
// flags: /home/hp/Projects/godot/pulse/generate-wrapper.py --include /usr/include/alsa/asoundlib.h --sys-include <alsa/asoundlib.h> --soname libasound.so.2 --init-name asound --omit-prefix snd_pcm_sw_params_set_tstamp_type --omit-prefix snd_pcm_status_get_audio_htstamp_report --omit-prefix snd_pcm_sw_params_get_tstamp_type --omit-prefix snd_pcm_status_set_audio_htstamp_config --output-header asound-so_wrap.h --output-implementation asound-so_wrap.c
// generated by /home/hp/Projects/pandemonium/pulse/generate-wrapper.py 0.3 on 2021-02-22 19:22:12
// flags: /home/hp/Projects/pandemonium/pulse/generate-wrapper.py --include /usr/include/alsa/asoundlib.h --sys-include <alsa/asoundlib.h> --soname libasound.so.2 --init-name asound --omit-prefix snd_pcm_sw_params_set_tstamp_type --omit-prefix snd_pcm_status_get_audio_htstamp_report --omit-prefix snd_pcm_sw_params_get_tstamp_type --omit-prefix snd_pcm_status_set_audio_htstamp_config --output-header asound-so_wrap.h --output-implementation asound-so_wrap.c
//
#include <stdint.h>

4
drivers/coremidi/midi_driver_coremidi.cpp
View File

@ -46,7 +46,7 @@ void MIDIDriverCoreMidi::read(const MIDIPacketList *packet_list, void *read_proc
}
Error MIDIDriverCoreMidi::open() {
CFStringRef name = CFStringCreateWithCString(NULL, "Godot", kCFStringEncodingASCII);
CFStringRef name = CFStringCreateWithCString(NULL, "Pandemonium", kCFStringEncodingASCII);
OSStatus result = MIDIClientCreate(name, NULL, NULL, &client);
CFRelease(name);
if (result != noErr) {
@ -54,7 +54,7 @@ Error MIDIDriverCoreMidi::open() {
return ERR_CANT_OPEN;
}
result = MIDIInputPortCreate(client, CFSTR("Godot Input"), MIDIDriverCoreMidi::read, (void *)this, &port_in);
result = MIDIInputPortCreate(client, CFSTR("Pandemonium Input"), MIDIDriverCoreMidi::read, (void *)this, &port_in);
if (result != noErr) {
ERR_PRINT("MIDIInputPortCreate failed, code: " + itos(result));
return ERR_CANT_OPEN;

2
drivers/gl_context/SCsub
View File

@ -23,7 +23,7 @@ if env["platform"] in ["haiku", "osx", "windows", "x11"]:
env.drivers_sources += thirdparty_obj
# Godot source files
# Pandemonium source files
driver_obj = []

2
drivers/gles2/rasterizer_gles2.cpp
View File

@ -252,7 +252,7 @@ void RasterizerGLES2::initialize() {
}
if (callback) {
print_line("godot: ENABLING GL DEBUG");
print_line("pandemonium: ENABLING GL DEBUG");
glEnable(_EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
callback(_gl_debug_print, NULL);
glEnable(_EXT_DEBUG_OUTPUT);

2
drivers/gles2/rasterizer_storage_gles2.cpp
View File

@ -5204,7 +5204,7 @@ void RasterizerStorageGLES2::render_target_set_external_texture(RID p_render_tar
if (rt->external.depth == 0) {
rt->external.depth_owned = true;
// create a multisample depth buffer, we're not reusing Godots because Godot's didn't get created..
// create a multisample depth buffer, we're not reusing Pandemoniums because Pandemonium's didn't get created..
glGenRenderbuffers(1, &rt->external.depth);
glBindRenderbuffer(GL_RENDERBUFFER, rt->external.depth);
glRenderbufferStorageMultisample(GL_RENDERBUFFER, msaa, config.depth_buffer_internalformat, rt->width, rt->height);

2
drivers/gles2/shaders/scene.glsl
View File

@ -1533,7 +1533,7 @@ void main() {
float anisotropy = 0.0;
vec2 anisotropy_flow = vec2(1.0, 0.0);
float sss_strength = 0.0; //unused
// gl_FragDepth is not available in GLES2, so writing to DEPTH is not converted to gl_FragDepth by Godot compiler resulting in a
// gl_FragDepth is not available in GLES2, so writing to DEPTH is not converted to gl_FragDepth by Pandemonium compiler resulting in a
// compile error because DEPTH is not a variable.
float m_DEPTH = 0.0;

2
drivers/gles_common/rasterizer_canvas_batcher.h
View File

@ -1453,7 +1453,7 @@ bool C_PREAMBLE::_prefill_ninepatch(RasterizerCanvas::Item::CommandNinePatch *p_
}
// cope with ninepatch of zero area. These cannot be created by the user interface or gdscript, but can
// be created programmatically from c++, e.g. by the Godot UI for sliders. We will just not draw these.
// be created programmatically from c++, e.g. by the Pandemonium UI for sliders. We will just not draw these.
if ((p_np->rect.size.x * p_np->rect.size.y) <= 0.0f) {
return false;
}

2
drivers/png/SCsub
View File

@ -60,7 +60,7 @@ if env["builtin_libpng"]:
env.drivers_sources += thirdparty_obj
# Godot source files
# Pandemonium source files
driver_obj = []

2
drivers/png/image_loader_png.cpp
View File

@ -79,7 +79,7 @@ Ref<Image> ImageLoaderPNG::lossless_unpack_png(const PoolVector<uint8_t> &p_data
PoolVector<uint8_t> ImageLoaderPNG::lossless_pack_png(const Ref<Image> &p_image) {
PoolVector<uint8_t> out_buffer;
// add Godot's own "PNG " prefix
// add Pandemonium's own "PNG " prefix
if (out_buffer.resize(4) != OK) {
ERR_FAIL_V(PoolVector<uint8_t>());
}

2
drivers/pulseaudio/audio_driver_pulseaudio.cpp
View File

@ -188,7 +188,7 @@ Error AudioDriverPulseAudio::init_device() {
// Detect the amount of channels PulseAudio is using
// Note: If using an even amount of channels (2, 4, etc) channels and pa_map.channels will be equal,
// if not then pa_map.channels will have the real amount of channels PulseAudio is using and channels
// will have the amount of channels Godot is using (in this case it's pa_map.channels + 1)
// will have the amount of channels Pandemonium is using (in this case it's pa_map.channels + 1)
Error err = detect_channels();
if (err != OK) {
// This most likely means there are no sinks.

4
drivers/pulseaudio/pulse-so_wrap.c
View File

@ -1,7 +1,7 @@
// This file is generated. Do not edit!
// see https://github.com/hpvb/dynload-wrapper for details
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.3 on 2021-02-20 00:08:31
// flags: /home/hp/Projects/godot/pulse/generate-wrapper.py --include /usr/include/pulse/pulseaudio.h --sys-include <pulse/pulseaudio.h> --soname libpulse.so.0 --omit-prefix _pa_ --init-name pulse --output-header pulse-so_wrap.h --output-implementation pulse-so_wrap.c
// generated by /home/hp/Projects/pandemonium/pulse/generate-wrapper.py 0.3 on 2021-02-20 00:08:31
// flags: /home/hp/Projects/pandemonium/pulse/generate-wrapper.py --include /usr/include/pulse/pulseaudio.h --sys-include <pulse/pulseaudio.h> --soname libpulse.so.0 --omit-prefix _pa_ --init-name pulse --output-header pulse-so_wrap.h --output-implementation pulse-so_wrap.c
//
#include <stdint.h>

4
drivers/pulseaudio/pulse-so_wrap.h
View File

@ -2,8 +2,8 @@
#define DYLIBLOAD_WRAPPER_PULSE
// This file is generated. Do not edit!
// see https://github.com/hpvb/dynload-wrapper for details
// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.3 on 2021-02-20 00:08:31
// flags: /home/hp/Projects/godot/pulse/generate-wrapper.py --include /usr/include/pulse/pulseaudio.h --sys-include <pulse/pulseaudio.h> --soname libpulse.so.0 --omit-prefix _pa_ --init-name pulse --output-header pulse-so_wrap.h --output-implementation pulse-so_wrap.c
// generated by /home/hp/Projects/pandemonium/pulse/generate-wrapper.py 0.3 on 2021-02-20 00:08:31
// flags: /home/hp/Projects/pandemonium/pulse/generate-wrapper.py --include /usr/include/pulse/pulseaudio.h --sys-include <pulse/pulseaudio.h> --soname libpulse.so.0 --omit-prefix _pa_ --init-name pulse --output-header pulse-so_wrap.h --output-implementation pulse-so_wrap.c
//
#include <stdint.h>

16
drivers/unix/os_unix.cpp
View File

@ -2,7 +2,7 @@
/* os_unix.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* PANDEMONIUM ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
@ -76,13 +76,13 @@ static void _setup_clock() {
}
#else
#if defined(CLOCK_MONOTONIC_RAW) && !defined(JAVASCRIPT_ENABLED) // This is a better clock on Linux.
#define GODOT_CLOCK CLOCK_MONOTONIC_RAW
#define PANDEMONIUM_CLOCK CLOCK_MONOTONIC_RAW
#else
#define GODOT_CLOCK CLOCK_MONOTONIC
#define PANDEMONIUM_CLOCK CLOCK_MONOTONIC
#endif
static void _setup_clock() {
struct timespec tv_now = { 0, 0 };
ERR_FAIL_COND_MSG(clock_gettime(GODOT_CLOCK, &tv_now) != 0, "OS CLOCK IS NOT WORKING!");
ERR_FAIL_COND_MSG(clock_gettime(PANDEMONIUM_CLOCK, &tv_now) != 0, "OS CLOCK IS NOT WORKING!");
_clock_start = ((uint64_t)tv_now.tv_nsec / 1000L) + (uint64_t)tv_now.tv_sec * 1000000L;
}
#endif
@ -252,7 +252,7 @@ uint64_t OS_Unix::get_ticks_usec() const {
// Unchecked return. Static analyzers might complain.
// If _setup_clock() succeeded, we assume clock_gettime() works.
struct timespec tv_now = { 0, 0 };
clock_gettime(GODOT_CLOCK, &tv_now);
clock_gettime(PANDEMONIUM_CLOCK, &tv_now);
uint64_t longtime = ((uint64_t)tv_now.tv_nsec / 1000L) + (uint64_t)tv_now.tv_sec * 1000000L;
#endif
longtime -= _clock_start;
@ -460,11 +460,11 @@ String OS_Unix::get_user_data_dir() const {
}
return get_data_path().plus_file(custom_dir);
} else {
return get_data_path().plus_file(get_godot_dir_name()).plus_file("app_userdata").plus_file(appname);
return get_data_path().plus_file(get_pandemonium_dir_name()).plus_file("app_userdata").plus_file(appname);
}
}
return get_data_path().plus_file(get_godot_dir_name()).plus_file("app_userdata").plus_file("[unnamed project]");
return get_data_path().plus_file(get_pandemonium_dir_name()).plus_file("app_userdata").plus_file("[unnamed project]");
}
String OS_Unix::get_executable_path() const {
@ -532,7 +532,7 @@ void UnixTerminalLogger::log_error(const char *p_function, const char *p_file, i
}
// Disable color codes if stdout is not a TTY.
// This prevents Godot from writing ANSI escape codes when redirecting
// This prevents Pandemonium from writing ANSI escape codes when redirecting
// stdout and stderr to a file.
const bool tty = isatty(fileno(stdout));
const char *gray = tty ? "\E[0;90m" : "";

4
editor/editor_file_system.cpp
View File

@ -56,7 +56,7 @@
#include "editor/editor_data.h"
EditorFileSystem *EditorFileSystem::singleton = nullptr;
//the name is the version, to keep compatibility with different versions of Godot
//the name is the version, to keep compatibility with different versions of Pandemonium
#define CACHE_FILE_NAME "filesystem_cache6"
void EditorFileSystemDirectory::sort_files() {
@ -2013,7 +2013,7 @@ bool EditorFileSystem::_should_skip_directory(const String &p_path) {
return true;
}
if (FileAccess::exists(p_path.plus_file("project.godot"))) { // skip if another project inside this
if (FileAccess::exists(p_path.plus_file("project.pandemonium"))) { // skip if another project inside this
return true;
}

12
editor/editor_node.cpp
View File

@ -625,7 +625,7 @@ void EditorNode::_notification(int p_what) {
p->set_item_icon(p->get_item_index(HELP_PANDEMONIUM_DOCS), gui_base->get_icon("Instance", "EditorIcons"));
p->set_item_icon(p->get_item_index(HELP_GODOT_DOCS), gui_base->get_icon("Instance", "EditorIcons"));
p->set_item_icon(p->get_item_index(HELP_REPORT_A_BUG), gui_base->get_icon("Instance", "EditorIcons"));
p->set_item_icon(p->get_item_index(HELP_ABOUT), gui_base->get_icon("Godot", "EditorIcons"));
p->set_item_icon(p->get_item_index(HELP_ABOUT), gui_base->get_icon("Pandemonium", "EditorIcons"));
p->set_item_icon(p->get_item_index(HELP_SUPPORT_PANDEMONIUM_DEVELOPMENT), gui_base->get_icon("Heart", "EditorIcons"));
_update_update_spinner();
@ -896,10 +896,10 @@ void EditorNode::_scan_external_changes() {
}
}
String project_settings_path = ProjectSettings::get_singleton()->get_resource_path().plus_file("project.godot");
String project_settings_path = ProjectSettings::get_singleton()->get_resource_path().plus_file("project.pandemonium");
if (FileAccess::get_modified_time(project_settings_path) > ProjectSettings::get_singleton()->get_last_saved_time()) {
TreeItem *ti = disk_changed_list->create_item(r);
ti->set_text(0, "project.godot");
ti->set_text(0, "project.pandemonium");
need_reload = true;
}
@ -5335,7 +5335,7 @@ bool EditorNode::call_build() {
for (int i = 0; i < build_callback_count && builds_successful; i++) {
if (!build_callbacks[i]()) {
ERR_PRINT("A Godot Engine build callback failed.");
ERR_PRINT("A Pandemonium Engine build callback failed.");
builds_successful = false;
}
}
@ -6317,10 +6317,10 @@ EditorNode::EditorNode() {
#endif
p->add_separator();
p->add_icon_shortcut(gui_base->get_icon("Instance", "EditorIcons"), ED_SHORTCUT("editor/online_docs", TTR("Online Documentation")), HELP_PANDEMONIUM_DOCS);
p->add_icon_shortcut(gui_base->get_icon("Instance", "EditorIcons"), ED_SHORTCUT("editor/godot_online_docs", TTR("Godot Online Documentation")), HELP_GODOT_DOCS);
p->add_icon_shortcut(gui_base->get_icon("Instance", "EditorIcons"), ED_SHORTCUT("editor/pandemonium_online_docs", TTR("Pandemonium Online Documentation")), HELP_GODOT_DOCS);
p->add_icon_shortcut(gui_base->get_icon("Instance", "EditorIcons"), ED_SHORTCUT("editor/report_a_bug", TTR("Report a Bug")), HELP_REPORT_A_BUG);
p->add_separator();
p->add_icon_shortcut(gui_base->get_icon("Godot", "EditorIcons"), ED_SHORTCUT("editor/about", TTR("About Pandemonium")), HELP_ABOUT);
p->add_icon_shortcut(gui_base->get_icon("Pandemonium", "EditorIcons"), ED_SHORTCUT("editor/about", TTR("About Pandemonium")), HELP_ABOUT);
p->add_icon_shortcut(gui_base->get_icon("Heart", "EditorIcons"), ED_SHORTCUT("editor/support_development", TTR("Support Pandemonium Development")), HELP_SUPPORT_PANDEMONIUM_DEVELOPMENT);
HBoxContainer *play_hb = memnew(HBoxContainer);

8
editor/editor_run.cpp
View File

@ -201,7 +201,7 @@ Error EditorRun::run(const String &p_scene, const String &p_custom_args, const L
if (p_custom_args != "") {
// Allow the user to specify a command to run, similar to Steam's launch options.
// In this case, Godot will no longer be run directly; it's up to the underlying command
// In this case, Pandemonium will no longer be run directly; it's up to the underlying command
// to run it. For instance, this can be used on Linux to force a running project
// to use Optimus using `prime-run` or similar.
// Example: `prime-run %command% --time-scale 0.5`
@ -217,7 +217,7 @@ Error EditorRun::run(const String &p_scene, const String &p_custom_args, const L
exec = exec_args[0];
exec_args.remove(0);
// Append the Godot executable name before we append executable arguments
// Append the Pandemonium executable name before we append executable arguments
// (since the order is reversed when using `push_front()`).
args.push_front(OS::get_singleton()->get_executable_path());
}
@ -227,13 +227,13 @@ Error EditorRun::run(const String &p_scene, const String &p_custom_args, const L
args.push_front(exec_args[i].replace(" ", "%20"));
}
// Append Godot-specific custom arguments.
// Append Pandemonium-specific custom arguments.
custom_args = p_custom_args.substr(placeholder_pos + String("%command%").size()).split(" ", false);
for (int i = 0; i < custom_args.size(); i++) {
args.push_back(custom_args[i].replace(" ", "%20"));
}
} else {
// Append Godot-specific custom arguments.
// Append Pandemonium-specific custom arguments.
custom_args = p_custom_args.split(" ", false);
for (int i = 0; i < custom_args.size(); i++) {
args.push_back(custom_args[i].replace(" ", "%20"));

12
editor/editor_settings.cpp
View File

@ -273,7 +273,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
String host_lang = OS::get_singleton()->get_locale();
host_lang = TranslationServer::standardize_locale(host_lang);
// Some locales are not properly supported currently in Godot due to lack of font shaping
// Some locales are not properly supported currently in Pandemonium due to lack of font shaping
// (e.g. Arabic or Hindi), so even though we have work in progress translations for them,
// we skip them as they don't render properly. (GH-28577)
const Vector<String> locales_to_skip = String("ar,bn,fa,he,hi,ml,si,ta,te,ur").split(",");
@ -359,7 +359,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
// Theme
_initial_set("interface/theme/preset", "Default");
hints["interface/theme/preset"] = PropertyInfo(Variant::STRING, "interface/theme/preset", PROPERTY_HINT_ENUM, "Default,Godot 3,Alien,Arc,Godot 2,Grey,Light,Solarized (Dark),Solarized (Light),Custom", PROPERTY_USAGE_DEFAULT);
hints["interface/theme/preset"] = PropertyInfo(Variant::STRING, "interface/theme/preset", PROPERTY_HINT_ENUM, "Default,Pandemonium 3,Alien,Arc,Pandemonium 2,Grey,Light,Solarized (Dark),Solarized (Light),Custom", PROPERTY_USAGE_DEFAULT);
_initial_set("interface/theme/icon_and_font_color", 0);
hints["interface/theme/icon_and_font_color"] = PropertyInfo(Variant::INT, "interface/theme/icon_and_font_color", PROPERTY_HINT_ENUM, "Auto,Dark,Light", PROPERTY_USAGE_DEFAULT);
_initial_set("interface/theme/base_color", Color(0.2, 0.23, 0.31));
@ -558,7 +558,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
_initial_set("editors/3d/navigation/navigation_scheme", 0);
_initial_set("editors/3d/navigation/invert_y_axis", false);
_initial_set("editors/3d/navigation/invert_x_axis", false);
hints["editors/3d/navigation/navigation_scheme"] = PropertyInfo(Variant::INT, "editors/3d/navigation/navigation_scheme", PROPERTY_HINT_ENUM, "Godot,Maya,Modo");
hints["editors/3d/navigation/navigation_scheme"] = PropertyInfo(Variant::INT, "editors/3d/navigation/navigation_scheme", PROPERTY_HINT_ENUM, "Pandemonium,Maya,Modo");
_initial_set("editors/3d/navigation/zoom_style", 0);
hints["editors/3d/navigation/zoom_style"] = PropertyInfo(Variant::INT, "editors/3d/navigation/zoom_style", PROPERTY_HINT_ENUM, "Vertical, Horizontal");
@ -848,16 +848,16 @@ void EditorSettings::create() {
} else {
// Typically XDG_DATA_HOME or %APPDATA%
data_path = OS::get_singleton()->get_data_path();
data_dir = data_path.plus_file(OS::get_singleton()->get_godot_dir_name());
data_dir = data_path.plus_file(OS::get_singleton()->get_pandemonium_dir_name());
// Can be different from data_path e.g. on Linux or macOS
config_path = OS::get_singleton()->get_config_path();
config_dir = config_path.plus_file(OS::get_singleton()->get_godot_dir_name());
config_dir = config_path.plus_file(OS::get_singleton()->get_pandemonium_dir_name());
// Can be different from above paths, otherwise a subfolder of data_dir
cache_path = OS::get_singleton()->get_cache_path();
if (cache_path == data_path) {
cache_dir = data_dir.plus_file("cache");
} else {
cache_dir = cache_path.plus_file(OS::get_singleton()->get_godot_dir_name());
cache_dir = cache_path.plus_file(OS::get_singleton()->get_pandemonium_dir_name());
}
}

2
editor/editor_themes.cpp
View File

@ -231,7 +231,7 @@ void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme =
exceptions.insert("EditorPivot");
exceptions.insert("EditorHandle");
exceptions.insert("Editor3DHandle");
exceptions.insert("Godot");
exceptions.insert("Pandemonium");
exceptions.insert("PanoramaSky");
exceptions.insert("ProceduralSky");
exceptions.insert("EditorControlAnchor");

2
editor/export_template_manager.cpp
View File

@ -1028,7 +1028,7 @@ ExportTemplateManager::ExportTemplateManager() {
install_file_dialog->set_title(TTR("Select Template File"));
install_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
install_file_dialog->set_mode(FileDialog::MODE_OPEN_FILE);
install_file_dialog->add_filter("*.tpz ; " + TTR("Godot Export Templates"));
install_file_dialog->add_filter("*.tpz ; " + TTR("Pandemonium Export Templates"));
install_file_dialog->connect("file_selected", this, "_install_file_selected", varray(false));
add_child(install_file_dialog);

4
editor/icons/README.md
View File

@ -1,7 +1,7 @@
# Editor icons
This folder contains all the icons used by Godot editor (except for platform
This folder contains all the icons used by Pandemonium editor (except for platform
icons which are located in their respective platform folder).
See [Editor icons](https://docs.godotengine.org/en/latest/development/editor/creating_icons.html)
in the documentation for details on creating icons for the Godot editor.
in the documentation for details on creating icons for the Pandemonium editor.

2
editor/icons/icon_godot.svg → editor/icons/icon_pandemonium.svg
View File

@ -5,7 +5,7 @@
id="svg3030"
version="1.1"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
sodipodi:docname="icon_godot.svg"
sodipodi:docname="icon_pandemonium.svg"
inkscape:export-filename="/home/relintai/Projects/broken_seals/pandemonium_engine/icon.png"
inkscape:export-xdpi="24"
inkscape:export-ydpi="24"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

2
editor/icons/icon_godot_docs.svg → editor/icons/icon_pandemonium_docs.svg
View File

@ -5,7 +5,7 @@
id="svg3030"
version="1.1"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
sodipodi:docname="icon_godot.svg"
sodipodi:docname="icon_pandemonium.svg"
inkscape:export-filename="/home/relintai/Projects/broken_seals/pandemonium_engine/icon.png"
inkscape:export-xdpi="24"
inkscape:export-ydpi="24"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

2
editor/import/resource_importer_layered_texture.cpp
View File

@ -95,7 +95,7 @@ void ResourceImporterLayeredTexture::_save_tex(const Vector<Ref<Image>> &p_image
} else {
f->store_8('A');
}
f->store_8('T'); //godot streamable texture
f->store_8('T'); //pandemonium streamable texture
f->store_32(p_images[0]->get_width());
f->store_32(p_images[0]->get_height());

2
editor/import/resource_importer_texture.cpp
View File

@ -215,7 +215,7 @@ void ResourceImporterTexture::_save_stex(const Ref<Image> &p_image, const String
f->store_8('G');
f->store_8('D');
f->store_8('S');
f->store_8('T'); //godot streamable texture
f->store_8('T'); //pandemonium streamable texture
bool resize_to_po2 = false;

2
editor/plugins/script_editor_plugin.cpp
View File

@ -3493,7 +3493,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
site_search->set_text(TTR("Online Docs"));
site_search->connect("pressed", this, "_menu_option", varray(SEARCH_WEBSITE));
menu_hb->add_child(site_search);
site_search->set_tooltip(TTR("Open Godot online documentation."));
site_search->set_tooltip(TTR("Open Pandemonium online documentation."));
help_search = memnew(ToolButton);
help_search->set_text(TTR("Search Help"));

6
editor/plugins/spatial_editor_plugin.cpp
View File

@ -2,7 +2,7 @@
/* spatial_editor_plugin.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* PANDEMONIUM ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
@ -1966,7 +1966,7 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
} else if (m->get_button_mask() & BUTTON_MASK_MIDDLE) {
const int mod = _get_key_modifier(m);
if (nav_scheme == NAVIGATION_GODOT) {
if (nav_scheme == NAVIGATION_PANDEMONIUM) {
if (mod == _get_key_modifier_setting("editors/3d/navigation/pan_modifier")) {
nav_mode = NAVIGATION_PAN;
} else if (mod == _get_key_modifier_setting("editors/3d/navigation/zoom_modifier")) {
@ -2038,7 +2038,7 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int();
NavigationMode nav_mode = NAVIGATION_NONE;
if (nav_scheme == NAVIGATION_GODOT) {
if (nav_scheme == NAVIGATION_PANDEMONIUM) {
const int mod = _get_key_modifier(pan_gesture);
if (mod == _get_key_modifier_setting("editors/3d/navigation/pan_modifier")) {

4
editor/plugins/spatial_editor_plugin.h
View File

@ -4,7 +4,7 @@
/* spatial_editor_plugin.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* PANDEMONIUM ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
@ -278,7 +278,7 @@ public:
};
enum NavigationScheme {
NAVIGATION_GODOT,
NAVIGATION_PANDEMONIUM,
NAVIGATION_MAYA,
NAVIGATION_MODO,
};

2
editor/project_export.cpp
View File

@ -1171,7 +1171,7 @@ ProjectExportDialog::ProjectExportDialog() {
export_pck_zip = memnew(EditorFileDialog);
export_pck_zip->add_filter("*.zip ; " + TTR("ZIP File"));
export_pck_zip->add_filter("*.pck ; " + TTR("Godot Game Pack"));
export_pck_zip->add_filter("*.pck ; " + TTR("Pandemonium Game Pack"));
export_pck_zip->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
export_pck_zip->set_mode(EditorFileDialog::MODE_SAVE_FILE);
add_child(export_pck_zip);

56
editor/project_manager.cpp
View File

@ -216,7 +216,7 @@ private:
}
if (mode == MODE_IMPORT || mode == MODE_RENAME) {
if (valid_path != "" && !d->file_exists("project.godot")) {
if (valid_path != "" && !d->file_exists("project.pandemonium")) {
if (valid_path.ends_with(".zip")) {
FileAccess *src_f = nullptr;
zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
@ -236,7 +236,7 @@ private:
char fname[16384];
ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
if (String::utf8(fname).ends_with("project.godot")) {
if (String::utf8(fname).ends_with("project.pandemonium")) {
break;
}
@ -244,7 +244,7 @@ private:
}
if (ret == UNZ_END_OF_LIST_OF_FILE) {
set_message(TTR("Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file."), MESSAGE_ERROR);
set_message(TTR("Invalid \".zip\" project file; it doesn't contain a \"project.pandemonium\" file."), MESSAGE_ERROR);
memdelete(d);
get_ok()->set_disabled(true);
unzClose(pkg);
@ -278,7 +278,7 @@ private:
}
} else {
set_message(TTR("Please choose a \"project.godot\" or \".zip\" file."), MESSAGE_ERROR);
set_message(TTR("Please choose a \"project.pandemonium\" or \".zip\" file."), MESSAGE_ERROR);
memdelete(d);
install_path_container->hide();
get_ok()->set_disabled(true);
@ -286,7 +286,7 @@ private:
}
} else if (valid_path.ends_with("zip")) {
set_message(TTR("This directory already contains a Godot project."), MESSAGE_ERROR, INSTALL_PATH);
set_message(TTR("This directory already contains a Pandemonium project."), MESSAGE_ERROR, INSTALL_PATH);
memdelete(d);
get_ok()->set_disabled(true);
return "";
@ -353,7 +353,7 @@ private:
void _file_selected(const String &p_path) {
String p = p_path;
if (mode == MODE_IMPORT) {
if (p.ends_with("project.godot")) {
if (p.ends_with("project.pandemonium")) {
p = p.get_base_dir();
install_path_container->hide();
get_ok()->set_disabled(false);
@ -362,7 +362,7 @@ private:
install_path_container->show();
get_ok()->set_disabled(false);
} else {
set_message(TTR("Please choose a \"project.godot\" or \".zip\" file."), MESSAGE_ERROR);
set_message(TTR("Please choose a \"project.pandemonium\" or \".zip\" file."), MESSAGE_ERROR);
get_ok()->set_disabled(true);
return;
}
@ -397,7 +397,7 @@ private:
if (mode == MODE_IMPORT) {
fdialog->set_mode(FileDialog::MODE_OPEN_FILE);
fdialog->clear_filters();
fdialog->add_filter(vformat("project.godot ; %s %s", VERSION_NAME, TTR("Project")));
fdialog->add_filter(vformat("project.pandemonium ; %s %s", VERSION_NAME, TTR("Project")));
fdialog->add_filter("*.zip ; " + TTR("ZIP File"));
} else {
fdialog->set_mode(FileDialog::MODE_OPEN_DIR);
@ -467,13 +467,13 @@ private:
int err = current->setup(dir2, "");
if (err != OK) {
set_message(vformat(TTR("Couldn't load project.godot in project path (error %d). It may be missing or corrupted."), err), MESSAGE_ERROR);
set_message(vformat(TTR("Couldn't load project.pandemonium in project path (error %d). It may be missing or corrupted."), err), MESSAGE_ERROR);
} else {
ProjectSettings::CustomMap edited_settings;
edited_settings["application/config/name"] = project_name->get_text().strip_edges();
if (current->save_custom(dir2.plus_file("project.godot"), edited_settings, Vector<String>(), true) != OK) {
set_message(TTR("Couldn't edit project.godot in project path."), MESSAGE_ERROR);
if (current->save_custom(dir2.plus_file("project.pandemonium"), edited_settings, Vector<String>(), true) != OK) {
set_message(TTR("Couldn't edit project.pandemonium in project path."), MESSAGE_ERROR);
}
}
@ -504,14 +504,14 @@ private:
initial_settings["rendering/environment/default_environment"] = "res://default_env.tres";
initial_settings["physics/common/enable_pause_aware_picking"] = true;
if (ProjectSettings::get_singleton()->save_custom(dir.plus_file("project.godot"), initial_settings, Vector<String>(), false) != OK) {
set_message(TTR("Couldn't create project.godot in project path."), MESSAGE_ERROR);
if (ProjectSettings::get_singleton()->save_custom(dir.plus_file("project.pandemonium"), initial_settings, Vector<String>(), false) != OK) {
set_message(TTR("Couldn't create project.pandemonium in project path."), MESSAGE_ERROR);
} else {
ResourceSaver::save(dir.plus_file("icon.png"), create_unscaled_default_project_icon());
FileAccess *f = FileAccess::open(dir.plus_file("default_env.tres"), FileAccess::WRITE);
if (!f) {
set_message(TTR("Couldn't create project.godot in project path."), MESSAGE_ERROR);
set_message(TTR("Couldn't create project.pandemonium in project path."), MESSAGE_ERROR);
} else {
f->store_line("[gd_resource type=\"Environment\" load_steps=2 format=2]");
f->store_line("[sub_resource type=\"ProceduralSky\" id=1]");
@ -547,8 +547,8 @@ private:
unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
String name = String::utf8(fname);
if (name.ends_with("project.godot")) {
zip_root = name.substr(0, name.rfind("project.godot"));
if (name.ends_with("project.pandemonium")) {
zip_root = name.substr(0, name.rfind("project.pandemonium"));
break;
}
@ -722,7 +722,7 @@ public:
int err = current->setup(project_path->get_text(), "");
if (err != OK) {
set_message(vformat(TTR("Couldn't load project.godot in project path (error %d). It may be missing or corrupted."), err), MESSAGE_ERROR);
set_message(vformat(TTR("Couldn't load project.pandemonium in project path (error %d). It may be missing or corrupted."), err), MESSAGE_ERROR);
status_rect->show();
msg->show();
get_ok()->set_disabled(true);
@ -1162,7 +1162,7 @@ void ProjectList::load_project_icon(int p_index) {
void ProjectList::load_project_data(const String &p_property_key, Item &p_item, bool p_favorite) {
String path = EditorSettings::get_singleton()->get(p_property_key);
String conf = path.plus_file("project.godot");
String conf = path.plus_file("project.pandemonium");
bool grayed = false;
bool missing = false;
@ -1180,7 +1180,7 @@ void ProjectList::load_project_data(const String &p_property_key, Item &p_item,
}
if (config_version > ProjectSettings::CONFIG_VERSION) {
// Comes from an incompatible (more recent) Godot version, grey it out
// Comes from an incompatible (more recent) Pandemonium version, grey it out
grayed = true;
}
@ -1241,7 +1241,7 @@ void ProjectList::load_projects() {
}
for (List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
// This is actually something like "projects/C:::Documents::Godot::Projects::MyGame"
// This is actually something like "projects/C:::Documents::Pandemonium::Projects::MyGame"
String property_key = E->get().name;
if (!property_key.begins_with("projects/")) {
continue;
@ -1285,7 +1285,7 @@ void ProjectList::update_dock_menu() {
}
favs_added = 0;
}
OS::get_singleton()->global_menu_add_item("_dock", _projects[i].project_name + " ( " + _projects[i].path + " )", GLOBAL_OPEN_PROJECT, Variant(_projects[i].path.plus_file("project.godot")));
OS::get_singleton()->global_menu_add_item("_dock", _projects[i].project_name + " ( " + _projects[i].path + " )", GLOBAL_OPEN_PROJECT, Variant(_projects[i].path.plus_file("project.pandemonium")));
total_added++;
}
}
@ -1995,7 +1995,7 @@ void ProjectManager::_open_selected_projects() {
for (const Set<String>::Element *E = selected_list.front(); E; E = E->next()) {
const String &selected = E->get();
String path = EditorSettings::get_singleton()->get("projects/" + selected);
String conf = path.plus_file("project.godot");
String conf = path.plus_file("project.pandemonium");
if (!FileAccess::exists(conf)) {
dialog_error->set_text(vformat(TTR("Can't open project at '%s'."), path));
@ -2054,12 +2054,12 @@ void ProjectManager::_open_selected_projects_ask() {
}
// Update the project settings or don't open
String conf = project.path.plus_file("project.godot");
String conf = project.path.plus_file("project.pandemonium");
int config_version = project.version;
// Check if the config_version property was empty or 0
if (config_version == 0) {
ask_update_settings->set_text(vformat(TTR("The following project settings file does not specify the version of Godot through which it was created.\n\n%s\n\nIf you proceed with opening it, it will be converted to Godot's current configuration file format.\nWarning: You won't be able to open the project with previous versions of the engine anymore."), conf));
ask_update_settings->set_text(vformat(TTR("The following project settings file does not specify the version of Pandemonium through which it was created.\n\n%s\n\nIf you proceed with opening it, it will be converted to Pandemonium's current configuration file format.\nWarning: You won't be able to open the project with previous versions of the engine anymore."), conf));
ask_update_settings->popup_centered_minsize();
return;
}
@ -2145,7 +2145,7 @@ void ProjectManager::_scan_dir(const String &path, List<String> *r_projects) {
while (n != String()) {
if (da->current_is_dir() && !n.begins_with(".")) {
_scan_dir(da->get_current_dir().plus_file(n), r_projects);
} else if (n == "project.godot") {
} else if (n == "project.pandemonium") {
r_projects->push_back(da->get_current_dir());
}
n = da->get_next();
@ -2289,7 +2289,7 @@ void ProjectManager::_files_dropped(PoolStringArray p_files, int p_screen) {
dir->list_dir_begin();
String file = dir->get_next();
while (confirm && file != String()) {
if (!dir->current_is_dir() && file.ends_with("project.godot")) {
if (!dir->current_is_dir() && file.ends_with("project.pandemonium")) {
confirm = false;
}
file = dir->get_next();
@ -2302,7 +2302,7 @@ void ProjectManager::_files_dropped(PoolStringArray p_files, int p_screen) {
multi_scan_ask->get_ok()->disconnect("pressed", this, "_scan_multiple_folders");
multi_scan_ask->get_ok()->connect("pressed", this, "_scan_multiple_folders", varray(folders));
multi_scan_ask->set_text(
vformat(TTR("Are you sure to scan %s folders for existing Godot projects?\nThis could take a while."), folders.size()));
vformat(TTR("Are you sure to scan %s folders for existing Pandemonium projects?\nThis could take a while."), folders.size()));
multi_scan_ask->popup_centered_minsize();
} else {
_scan_multiple_folders(folders);
@ -2448,7 +2448,7 @@ ProjectManager::ProjectManager() {
String cp;
cp += 0xA9;
// TRANSLATORS: This refers to the application where users manage their Godot projects.
// TRANSLATORS: This refers to the application where users manage their Pandemonium projects.
OS::get_singleton()->set_window_title(VERSION_NAME + String(" - ") + TTR("Project Manager"));
Control *center_box = memnew(Control);

2
editor/project_settings_editor.cpp
View File

@ -1845,7 +1845,7 @@ void ProjectSettingsEditor::_bind_methods() {
ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
singleton = this;
set_title(TTR("Project Settings (project.godot)"));
set_title(TTR("Project Settings (project.pandemonium)"));
set_resizable(true);
undo_redo = &p_data->get_undo_redo();
data = p_data;

2
editor/script_editor_debugger.cpp
View File

@ -2330,7 +2330,7 @@ void ScriptEditorDebugger::_item_menu_id_pressed(int p_option) {
// Construct a GitHub repository URL and open it in the user's default web browser.
// If the commit hash is available, use it for greater accuracy. Otherwise fall back to tagged release.
String git_ref = String(VERSION_HASH).empty() ? String(VERSION_NUMBER) + "-stable" : String(VERSION_HASH);
OS::get_singleton()->shell_open(vformat("https://github.com/godotengine/godot/blob/%s/%s#L%d",
OS::get_singleton()->shell_open(vformat("https://github.com/Relintai/pandemonium_engine/blob/%s/%s#L%d",
git_ref, file, line_number));
} break;
}

64
editor/translations/editor.pot
View File

@ -1,4 +1,4 @@
# LANGUAGE translation of the Godot Engine editor.
# LANGUAGE translation of the Pandemonium Engine editor.
# Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.
# Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).
# This file is distributed under the same license as the Godot source code.
@ -8,8 +8,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Godot Engine editor\n"
"Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
"Project-Id-Version: Pandemonium Engine editor\n"
"Report-Msgid-Bugs-To: https://github.com/Relintai/pandemonium_engine\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
@ -1118,7 +1118,7 @@ msgid "Change Dictionary Value"
msgstr ""
#: editor/editor_about.cpp
msgid "Thanks from the Godot community!"
msgid "Thanks from the Pandemonium community!"
msgstr ""
#: editor/editor_about.cpp editor/editor_node.cpp editor/project_manager.cpp
@ -1126,7 +1126,7 @@ msgid "Click to copy."
msgstr ""
#: editor/editor_about.cpp
msgid "Godot Engine contributors"
msgid "Pandemonium Engine contributors"
msgstr ""
#: editor/editor_about.cpp
@ -1198,7 +1198,7 @@ msgstr ""
#: editor/editor_about.cpp
msgid ""
"Godot Engine relies on a number of third-party free and open source "
"Pandemonium Engine relies on a number of third-party free and open source "
"libraries, all compatible with the terms of its MIT license. The following "
"is an exhaustive list of all such third-party components with their "
"respective copyright statements and license terms."
@ -1834,7 +1834,7 @@ msgid "New profile name:"
msgstr ""
#: editor/editor_feature_profile.cpp
msgid "Godot Feature Profile"
msgid "Pandemonium Feature Profile"
msgstr ""
#: editor/editor_feature_profile.cpp
@ -3072,11 +3072,11 @@ msgid "Community"
msgstr ""
#: editor/editor_node.cpp
msgid "About Godot"
msgid "About Pandemonium"
msgstr ""
#: editor/editor_node.cpp
msgid "Support Godot Development"
msgid "Support Pandemonium Development"
msgstr ""
#: editor/editor_node.cpp
@ -3797,7 +3797,7 @@ msgid "Select Template File"
msgstr ""
#: editor/export_template_manager.cpp
msgid "Godot Export Templates"
msgid "Pandemonium Export Templates"
msgstr ""
#: editor/export_template_manager.cpp
@ -5419,7 +5419,7 @@ msgstr ""
#: editor/plugins/baked_lightmap_editor_plugin.cpp
msgid ""
"Godot editor was built without ray tracing support, lightmaps can't be baked."
"Pandemonium editor was built without ray tracing support, lightmaps can't be baked."
msgstr ""
#: editor/plugins/baked_lightmap_editor_plugin.cpp
@ -7312,7 +7312,7 @@ msgid "Online Docs"
msgstr ""
#: editor/plugins/script_editor_plugin.cpp
msgid "Open Godot online documentation."
msgid "Open Pandemonium online documentation."
msgstr ""
#: editor/plugins/script_editor_plugin.cpp
@ -10319,7 +10319,7 @@ msgstr ""
#: editor/plugins/visual_shader_editor_plugin.cpp
msgid ""
"Custom Godot Shader Language expression, with custom amount of input and "
"Custom Pandemonium Shader Language expression, with custom amount of input and "
"output ports. This is a direct injection of code into the vertex/fragment/"
"light function, do not use it to write the function declarations inside."
msgstr ""
@ -10332,7 +10332,7 @@ msgstr ""
#: editor/plugins/visual_shader_editor_plugin.cpp
msgid ""
"Custom Godot Shader Language expression, which is placed on top of the "
"Custom Pandemonium Shader Language expression, which is placed on top of the "
"resulted shader. You can place various function definitions inside and call "
"it later in the Expressions. You can also declare varyings, uniforms and "
"constants."
@ -10550,7 +10550,7 @@ msgid "ZIP File"
msgstr ""
#: editor/project_export.cpp
msgid "Godot Game Pack"
msgid "Pandemonium Game Pack"
msgstr ""
#: editor/project_export.cpp
@ -10575,7 +10575,7 @@ msgstr ""
#: editor/project_manager.cpp
msgid ""
"Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file."
"Invalid \".zip\" project file; it doesn't contain a \"project.pandemonium\" file."
msgstr ""
#: editor/project_manager.cpp
@ -10583,11 +10583,11 @@ msgid "Please choose an empty folder."
msgstr ""
#: editor/project_manager.cpp
msgid "Please choose a \"project.godot\" or \".zip\" file."
msgid "Please choose a \"project.pandemonium\" or \".zip\" file."
msgstr ""
#: editor/project_manager.cpp
msgid "This directory already contains a Godot project."
msgid "This directory already contains a Pandemonium project."
msgstr ""
#: editor/project_manager.cpp
@ -10620,16 +10620,16 @@ msgstr ""
#: editor/project_manager.cpp
msgid ""
"Couldn't load project.godot in project path (error %d). It may be missing or "
"Couldn't load project.pandemonium in project path (error %d). It may be missing or "
"corrupted."
msgstr ""
#: editor/project_manager.cpp
msgid "Couldn't edit project.godot in project path."
msgid "Couldn't edit project.pandemonium in project path."
msgstr ""
#: editor/project_manager.cpp
msgid "Couldn't create project.godot in project path."
msgid "Couldn't create project.pandemonium in project path."
msgstr ""
#: editor/project_manager.cpp
@ -10742,12 +10742,12 @@ msgstr ""
#: editor/project_manager.cpp
msgid ""
"The following project settings file does not specify the version of Godot "
"The following project settings file does not specify the version of Pandemonium "
"through which it was created.\n"
"\n"
"%s\n"
"\n"
"If you proceed with opening it, it will be converted to Godot's current "
"If you proceed with opening it, it will be converted to Pandemonium's current "
"configuration file format.\n"
"Warning: You won't be able to open the project with previous versions of the "
"engine anymore."
@ -10810,11 +10810,11 @@ msgstr ""
#: editor/project_manager.cpp
msgid ""
"Are you sure to scan %s folders for existing Godot projects?\n"
"Are you sure to scan %s folders for existing Pandemonium projects?\n"
"This could take a while."
msgstr ""
#. TRANSLATORS: This refers to the application where users manage their Godot projects.
#. TRANSLATORS: This refers to the application where users manage their Pandemonium projects.
#: editor/project_manager.cpp
msgid "Project Manager"
msgstr ""
@ -11137,7 +11137,7 @@ msgid "Changed Locale Filter Mode"
msgstr ""
#: editor/project_settings_editor.cpp
msgid "Project Settings (project.godot)"
msgid "Project Settings (project.pandemonium)"
msgstr ""
#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp
@ -13338,11 +13338,11 @@ msgstr ""
#: platform/android/export/export_plugin.cpp
msgid ""
"Invalid \"GodotPaymentV3\" module included in the \"android/modules\" "
"project setting (changed in Godot 3.2.2).\n"
"Replace it with the first-party \"GodotGooglePlayBilling\" plugin.\n"
"Note that the singleton was also renamed from \"GodotPayments\" to "
"\"GodotGooglePlayBilling\"."
"Invalid \"PandemoniumPaymentV3\" module included in the \"android/modules\" "
"project setting (changed in Pandemonium 3.2.2).\n"
"Replace it with the first-party \"PandemoniumGooglePlayBilling\" plugin.\n"
"Note that the singleton was also renamed from \"PandemoniumPayments\" to "
"\"PandemoniumGooglePlayBilling\"."
msgstr ""
#: platform/android/export/export_plugin.cpp
@ -13440,7 +13440,7 @@ msgstr ""
msgid ""
"Android build version mismatch:\n"
" Template installed: %s\n"
" Godot Version: %s\n"
" Pandemonium Version: %s\n"
"Please reinstall Android build template from 'Project' menu."
msgstr ""

6
editor/translations/extract.py
View File

@ -44,7 +44,7 @@ with open("editor/editor_property_name_processor.cpp") as f:
unique_str = []
unique_loc = {}
main_po = """
# LANGUAGE translation of the Godot Engine editor.
# LANGUAGE translation of the Pandemonium Engine editor.
# Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.
# Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).
# This file is distributed under the same license as the Godot source code.
@ -54,8 +54,8 @@ main_po = """
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Godot Engine editor\\n"
"Report-Msgid-Bugs-To: https://github.com/godotengine/godot\\n"
"Project-Id-Version: Pandemonium Engine editor\\n"
"Report-Msgid-Bugs-To: https://github.com/Relintai/pandemonium_engine\\n"
"MIME-Version: 1.0\\n"
"Content-Type: text/plain; charset=UTF-8\\n"
"Content-Transfer-Encoding: 8-bit\\n"\n

2
main/SCsub
View File

@ -10,7 +10,7 @@ env.main_sources = []
env.add_source_files(env.main_sources, "*.cpp")
# Order matters here. Higher index controller database files write on top of lower index database files.
controller_databases = ["gamecontrollerdb.txt", "godotcontrollerdb.txt"]
controller_databases = ["gamecontrollerdb.txt", "pandemoniumcontrollerdb.txt"]
gensource = env.CommandNoCache(
"default_controller_mappings.gen.cpp",

2
main/input_default.cpp
View File

@ -1095,7 +1095,7 @@ void InputDefault::_get_mapped_hat_events(const JoyDeviceMapping &mapping, int p
}
}
// string names of the SDL buttons in the same order as input_event.h godot buttons
// string names of the SDL buttons in the same order as input_event.h pandemonium buttons
static const char *_joy_buttons[] = { "a", "b", "x", "y", "leftshoulder", "rightshoulder", "lefttrigger", "righttrigger", "leftstick", "rightstick", "back", "start", "dpup", "dpdown", "dpleft", "dpright", "guide", "misc1", "paddle1", "paddle2", "paddle3", "paddle4", "touchpad", nullptr };
static const char *_joy_axes[] = { "leftx", "lefty", "rightx", "righty", nullptr };

38
main/main.cpp
View File

@ -2,7 +2,7 @@
/* main.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* PANDEMONIUM ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
@ -179,9 +179,9 @@ static String get_full_version_string() {
void initialize_physics() {
// This must be defined BEFORE the 3d physics server is created,
// otherwise it won't always show up in the project settings page.
GLOBAL_DEF("physics/3d/godot_physics/use_bvh", true);
GLOBAL_DEF("physics/3d/godot_physics/bvh_collision_margin", 0.1);
ProjectSettings::get_singleton()->set_custom_property_info("physics/3d/godot_physics/bvh_collision_margin", PropertyInfo(Variant::REAL, "physics/3d/godot_physics/bvh_collision_margin", PROPERTY_HINT_RANGE, "0.0,2.0,0.01"));
GLOBAL_DEF("physics/3d/pandemonium_physics/use_bvh", true);
GLOBAL_DEF("physics/3d/pandemonium_physics/bvh_collision_margin", 0.1);
ProjectSettings::get_singleton()->set_custom_property_info("physics/3d/pandemonium_physics/bvh_collision_margin", PropertyInfo(Variant::REAL, "physics/3d/pandemonium_physics/bvh_collision_margin", PROPERTY_HINT_RANGE, "0.0,2.0,0.01"));
/// 3D Physics Server
physics_server = PhysicsServerManager::new_server(ProjectSettings::get_singleton()->get(PhysicsServerManager::setting_property_name));
@ -234,9 +234,9 @@ void Main::print_help(const char *p_binary) {
print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
OS::get_singleton()->print("Free and open source software under the terms of the MIT license.\n");
OS::get_singleton()->print("(c) 2007-2022 Juan Linietsky, Ariel Manzur.\n");
OS::get_singleton()->print("(c) 2014-2022 Godot Engine contributors.\n");
OS::get_singleton()->print("(c) 2014-2022 Pandemonium Engine contributors.\n");
OS::get_singleton()->print("\n");
OS::get_singleton()->print("Usage: %s [options] [path to scene or 'project.godot' file]\n", p_binary);
OS::get_singleton()->print("Usage: %s [options] [path to scene or 'project.pandemonium' file]\n", p_binary);
OS::get_singleton()->print("\n");
OS::get_singleton()->print("General options:\n");
@ -253,8 +253,8 @@ void Main::print_help(const char *p_binary) {
#endif
OS::get_singleton()->print(" -q, --quit Quit after the first iteration.\n");
OS::get_singleton()->print(" -l, --language <locale> Use a specific locale (<locale> being a two-letter code).\n");
OS::get_singleton()->print(" --path <directory> Path to a project (<directory> must contain a 'project.godot' file).\n");
OS::get_singleton()->print(" -u, --upwards Scan folders upwards for project.godot file.\n");
OS::get_singleton()->print(" --path <directory> Path to a project (<directory> must contain a 'project.pandemonium' file).\n");
OS::get_singleton()->print(" -u, --upwards Scan folders upwards for project.pandemonium file.\n");
OS::get_singleton()->print(" --main-pack <file> Path to a pack (.pck) file to load.\n");
OS::get_singleton()->print(" --render-thread <mode> Render thread mode ('unsafe', 'safe', 'separate').\n");
OS::get_singleton()->print(" --remote-fs <address> Remote filesystem (<host/IP>[:<port>] address).\n");
@ -331,7 +331,7 @@ void Main::print_help(const char *p_binary) {
OS::get_singleton()->print(" --doctool [<path>] Dump the engine API reference to the given <path> (defaults to current dir) in XML format, merging if existing files are found.\n");
OS::get_singleton()->print(" --no-docbase Disallow dumping the base types (used with --doctool).\n");
#ifdef DEBUG_METHODS_ENABLED
OS::get_singleton()->print(" --gdnative-generate-json-api Generate JSON dump of the Godot API for GDNative bindings.\n");
OS::get_singleton()->print(" --gdnative-generate-json-api Generate JSON dump of the Pandemonium API for GDNative bindings.\n");
#endif
OS::get_singleton()->print(" --test <test> Run a unit test (");
const char **test_names = tests_get_names();
@ -400,7 +400,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
ClassDB::register_class<Performance>();
engine->add_singleton(Engine::Singleton("Performance", performance));
GLOBAL_DEF("debug/settings/crash_handler/message", String("Please include this when reporting the bug on https://github.com/godotengine/godot/issues"));
GLOBAL_DEF("debug/settings/crash_handler/message", String("Please include this when reporting the bug on https://github.com/Relintai/pandemonium_engine/issues"));
MAIN_PRINT("Main: Parse CMDLine");
@ -468,7 +468,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
while (I) {
#ifdef OSX_ENABLED
// Ignore the process serial number argument passed by macOS Gatekeeper.
// Otherwise, Godot would try to open a non-existent project on the first start and abort.
// Otherwise, Pandemonium would try to open a non-existent project on the first start and abort.
if (I->get().begins_with("-psn_")) {
I = I->next();
continue;
@ -747,7 +747,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
upwards = true;
} else if (I->get() == "-q" || I->get() == "--quit") { // Auto quit at the end of the first main loop iteration
auto_quit = true;
} else if (I->get().ends_with("project.godot")) {
} else if (I->get().ends_with("project.pandemonium")) {
String path;
String file = I->get();
int sep = MAX(file.rfind("/"), file.rfind("\\"));
@ -867,7 +867,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
#endif
// Network file system needs to be configured before globals, since globals are based on the
// 'project.godot' file which will only be available through the network if this is enabled
// 'project.pandemonium' file which will only be available through the network if this is enabled
FileAccessNetwork::configure();
if (remotefs != "") {
file_access_network_client = memnew(FileAccessNetworkClient);
@ -986,7 +986,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
// This also prevents logs from being created for the editor instance, as feature tags
// are disabled while in the editor (even if they should logically apply).
GLOBAL_DEF("logging/file_logging/enable_file_logging.pc", true);
GLOBAL_DEF("logging/file_logging/log_path", "user://logs/godot.log");
GLOBAL_DEF("logging/file_logging/log_path", "user://logs/pandemonium.log");
GLOBAL_DEF("logging/file_logging/max_log_files", 5);
ProjectSettings::get_singleton()->set_custom_property_info("logging/file_logging/max_log_files", PropertyInfo(Variant::INT, "logging/file_logging/max_log_files", PROPERTY_HINT_RANGE, "0,20,1,or_greater")); //no negative numbers
if (!project_manager && !editor && FileAccess::get_create_func(FileAccess::ACCESS_USERDATA) && GLOBAL_GET("logging/file_logging/enable_file_logging")) {
@ -1097,7 +1097,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
OS::get_singleton()->_vsync_via_compositor = video_mode.vsync_via_compositor;
if (tablet_driver == "") { // specified in project.godot
if (tablet_driver == "") { // specified in project.pandemonium
tablet_driver = GLOBAL_DEF_RST_NOVAL("display/window/tablet_driver", OS::get_singleton()->get_tablet_driver_name(0));
}
@ -1156,7 +1156,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
video_driver_idx = 0;
}
if (audio_driver == "") { // specified in project.godot
if (audio_driver == "") { // specified in project.pandemonium
audio_driver = GLOBAL_DEF_RST_NOVAL("audio/driver", OS::get_singleton()->get_audio_driver_name(0));
}
@ -1324,8 +1324,8 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
#ifdef UNIX_ENABLED
// Print warning before initializing audio.
if (OS::get_singleton()->get_environment("USER") == "root" && !OS::get_singleton()->has_environment("GODOT_SILENCE_ROOT_WARNING")) {
WARN_PRINT("Started the engine as `root`/superuser. This is a security risk, and subsystems like audio may not work correctly.\nSet the environment variable `GODOT_SILENCE_ROOT_WARNING` to 1 to silence this warning.");
if (OS::get_singleton()->get_environment("USER") == "root" && !OS::get_singleton()->has_environment("PANDEMONIUM_SILENCE_ROOT_WARNING")) {
WARN_PRINT("Started the engine as `root`/superuser. This is a security risk, and subsystems like audio may not work correctly.\nSet the environment variable `PANDEMONIUM_SILENCE_ROOT_WARNING` to 1 to silence this warning.");
}
#endif
@ -1585,7 +1585,7 @@ bool Main::start() {
args[i].ends_with(".res") ||
args[i].ends_with(".tres")) {
// Only consider the positional argument to be a scene path if it ends with
// a file extension associated with Godot scenes. This makes it possible
// a file extension associated with Pandemonium scenes. This makes it possible
// for projects to parse command-line arguments for custom CLI arguments
// or other file extensions without trouble. This can be used to implement
// "drag-and-drop onto executable" logic, which can prove helpful

10
main/main_timer_sync.cpp
View File

@ -2,7 +2,7 @@
/* main_timer_sync.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* PANDEMONIUM ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
@ -83,7 +83,7 @@ void MainTimerSync::DeltaSmoother::update_refresh_rate_estimator(int64_t p_delta
// dropping loads of frames, so the estimate will be inaccurate
if (fps >= 50) {
_estimated_fps = fps;
#ifdef GODOT_DEBUG_DELTA_SMOOTHER
#ifdef PANDEMONIUM_DEBUG_DELTA_SMOOTHER
print_line("initial guess (average measured) refresh rate: " + itos(fps));
#endif
} else {
@ -100,7 +100,7 @@ void MainTimerSync::DeltaSmoother::update_refresh_rate_estimator(int64_t p_delta
if (_estimate_complete && _hits_at_estimated == 20) {
_estimate_locked = true;
#ifdef GODOT_DEBUG_DELTA_SMOOTHER
#ifdef PANDEMONIUM_DEBUG_DELTA_SMOOTHER
print_line("estimate LOCKED at " + itos(_estimated_fps) + " fps");
#endif
return;
@ -114,13 +114,13 @@ void MainTimerSync::DeltaSmoother::update_refresh_rate_estimator(int64_t p_delta
_estimate_complete = true;
_vsync_delta = 1000000 / _estimated_fps;
#ifdef GODOT_DEBUG_DELTA_SMOOTHER
#ifdef PANDEMONIUM_DEBUG_DELTA_SMOOTHER
print_line("estimate complete. vsync_delta " + itos(_vsync_delta) + ", fps " + itos(_estimated_fps));
#endif
}
}
#ifdef GODOT_DEBUG_DELTA_SMOOTHER
#ifdef PANDEMONIUM_DEBUG_DELTA_SMOOTHER
if ((_hits_at_estimated % (400 / NUM_READINGS)) == 0) {
String sz = "hits at estimated : " + itos(_hits_at_estimated) + ", above : " + itos(_hits_above_estimated) + "( " + itos(_hits_one_above_estimated) + " ), below : " + itos(_hits_below_estimated) + " (" + itos(_hits_one_below_estimated) + " )";

6
main/main_timer_sync.h
View File

@ -4,7 +4,7 @@
/* main_timer_sync.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* PANDEMONIUM ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
@ -33,7 +33,7 @@
#include "core/engine.h"
// define these to get more debugging logs for the delta smoothing
//#define GODOT_DEBUG_DELTA_SMOOTHER
//#define PANDEMONIUM_DEBUG_DELTA_SMOOTHER
struct MainFrameTime {
float idle_step; // time to advance idles for (argument to process())
@ -97,7 +97,7 @@ class MainTimerSync {
_estimate_complete = false;
#ifdef GODOT_DEBUG_DELTA_SMOOTHER
#ifdef PANDEMONIUM_DEBUG_DELTA_SMOOTHER
print_line("estimated fps " + itos(_estimated_fps));
#endif
}

2
main/godotcontrollerdb.txt → main/pandemoniumcontrollerdb.txt
View File

@ -1,5 +1,5 @@
# Game Controller DB for Godot in SDL 2.0.16 format
# Source: https://github.com/godotengine/godot
# Source: https://github.com/Relintai/pandemonium_engine
# Windows
__XINPUT_DEVICE__,XInput Gamepad,a:b12,b:b13,x:b14,y:b15,start:b4,back:b5,leftstick:b6,rightstick:b7,leftshoulder:b8,rightshoulder:b9,dpup:b0,dpdown:b1,dpleft:b2,dpright:b3,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,platform:Windows,

2
main/tests/test_gui.h
View File

@ -4,7 +4,7 @@
/* test_gui.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* PANDEMONIUM ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */

2
main/tests/test_oa_hash_map.cpp
View File

@ -119,7 +119,7 @@ MainLoop *test() {
map.set("Hello", 1);
map.set("World", 2);
map.set("Godot rocks", 42);
map.set("Pandemonium rocks", 42);
for (OAHashMap<String, int>::Iterator it = map.iter(); it.valid; it = map.next_iter(it)) {
OS::get_singleton()->print("map[\"%s\"] = %d\n", it.key->utf8().get_data(), *it.value);

2
main/tests/test_shader_lang.cpp
View File

@ -312,7 +312,7 @@ MainLoop *test() {
if (cmdlargs.empty()) {
//try editor!
print_line("usage: godot -test shaderlang <shader>");
print_line("usage: pandemonium -test shaderlang <shader>");
return nullptr;
}

6
main/tests/test_string.cpp
View File

@ -971,7 +971,7 @@ bool test_31() {
state = false;
}
String b = "Godot";
String b = "Pandemonium";
success = b[b.size()] == 0;
OS::get_singleton()->print("Is 0 String[size()]:, %s\n", success ? "OK" : "FAIL");
if (!success) {
@ -985,7 +985,7 @@ bool test_31() {
state = false;
}
const String d = "Godot";
const String d = "Pandemonium";
success = d[d.size()] == 0;
OS::get_singleton()->print("Is 0 const String[size()]:, %s\n", success ? "OK" : "FAIL");
if (!success) {
@ -1112,7 +1112,7 @@ bool test_35() {
COUNT_TEST(String("Testa").count("Test") == 1);
COUNT_TEST(String("TestTestTest").count("Test") == 3);
COUNT_TEST(String("TestTestTest").count("TestTest") == 1);
COUNT_TEST(String("TestGodotTestGodotTestGodot").count("Test") == 3);
COUNT_TEST(String("TestPandemoniumTestPandemoniumTestPandemonium").count("Test") == 3);
COUNT_TEST(String("TestTestTestTest").count("Test", 4, 8) == 1);
COUNT_TEST(String("TestTestTestTest").count("Test", 4, 12) == 2);

8
main/tests/test_transform.cpp
View File

@ -2,7 +2,7 @@
/* test_transform.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* PANDEMONIUM ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
@ -36,7 +36,7 @@
#include "core/os/os.h"
#include "core/ustring.h"
// #define GODOT_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED
// #define PANDEMONIUM_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED
namespace TestTransform {
@ -147,7 +147,7 @@ bool test_aabb() {
pass = false;
}
#ifdef GODOT_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED
#ifdef PANDEMONIUM_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED
if (!test_aabb_non_uniform_scale()) {
pass = false;
}
@ -232,7 +232,7 @@ bool test_vector3() {
pass = false;
}
#ifdef GODOT_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED
#ifdef PANDEMONIUM_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED
if (!test_vector3_non_uniform_scale()) {
pass = false;
}

20
methods.py
View File

@ -79,11 +79,11 @@ def update_version(module_version_string=""):
f.write("#define VERSION_PATCH " + str(version.patch) + "\n")
# For dev snapshots (alpha, beta, RC, etc.) we do not commit status change to Git,
# so this define provides a way to override it without having to modify the source.
godot_status = str(version.status)
if os.getenv("GODOT_VERSION_STATUS") != None:
godot_status = str(os.getenv("GODOT_VERSION_STATUS"))
print("Using version status '{}', overriding the original '{}'.".format(godot_status, str(version.status)))
f.write('#define VERSION_STATUS "' + godot_status + '"\n')
pandemonium_status = str(version.status)
if os.getenv("PANDEMONIUM_VERSION_STATUS") != None:
pandemonium_status = str(os.getenv("PANDEMONIUM_VERSION_STATUS"))
print("Using version status '{}', overriding the original '{}'.".format(pandemonium_status, str(version.status)))
f.write('#define VERSION_STATUS "' + pandemonium_status + '"\n')
f.write('#define VERSION_BUILD "' + str(build_name) + '"\n')
f.write('#define VERSION_MODULE_CONFIG "' + str(version.module_config) + module_version_string + '"\n')
f.write("#define VERSION_YEAR " + str(version.year) + "\n")
@ -186,11 +186,11 @@ def detect_modules(search_path, recursive=False):
def is_engine(path):
# Prevent recursively detecting modules in self and other
# Godot sources when using `custom_modules` build option.
# Pandemonium sources when using `custom_modules` build option.
version_path = os.path.join(path, "version.py")
if os.path.exists(version_path):
with open(version_path) as f:
if 'short_name = "godot"' in f.read():
if 'short_name = "pandemonium"' in f.read():
return True
return False
@ -541,7 +541,7 @@ def detect_visual_c_compiler_version(tools_env):
# "x86" Native 32 bit compiler
# "x86_amd64" 32 bit Cross Compiler for 64 bit
# There are other architectures, but Godot does not support them currently, so this function does not detect arm/amd64_arm
# There are other architectures, but Pandemonium does not support them currently, so this function does not detect arm/amd64_arm
# and similar architectures/compilers
# Set chosen compiler to "not detected"
@ -722,7 +722,7 @@ def generate_vs_project(env, num_jobs):
for platform in ModuleConfigs.PLATFORMS
]
self.arg_dict["runfile"] += [
f'bin\\godot.windows.{config_id}.{plat_id}{f".{name}" if name else ""}.exe'
f'bin\\pandemonium.windows.{config_id}.{plat_id}{f".{name}" if name else ""}.exe'
for config_id in ModuleConfigs.CONFIGURATION_IDS
for plat_id in ModuleConfigs.PLATFORM_IDS
]
@ -811,7 +811,7 @@ def generate_vs_project(env, num_jobs):
env["MSVS"]["PROJECTSUFFIX"] = ".vcxproj"
env["MSVS"]["SOLUTIONSUFFIX"] = ".sln"
env.MSVSProject(
target=["#godot" + env["MSVSPROJECTSUFFIX"]],
target=["#pandemonium" + env["MSVSPROJECTSUFFIX"]],
incs=env.vs_incs,
srcs=env.vs_srcs,
auto_build_solution=1,

4
misc/dist/docker/Dockerfile vendored
View File

@ -1,7 +1,7 @@
FROM ubuntu:14.04
MAINTAINER Mohammad Rezai, https://github.com/mrezai
WORKDIR /godot-dev
COPY scripts/install-android-tools /godot-dev/
WORKDIR /pandemonium-dev
COPY scripts/install-android-tools /pandemonium-dev/
ENV DEBIAN_FRONTEND noninteractive
RUN dpkg --add-architecture i386 && \
apt-get update && \

24
misc/dist/docker/README.md vendored
View File

@ -1,6 +1,6 @@
## A Docker image to build Linux, Windows and Android godot binaries.
## A Docker image to build Linux, Windows and Android pandemonium binaries.
The main reason to write this, is to provide a simple way in all platforms to integrate external godot modules and build a custom version of godot.
The main reason to write this, is to provide a simple way in all platforms to integrate external pandemonium modules and build a custom version of pandemonium.
## usage
1. Install docker on Linux or docker toolbox on Windows or Mac.
@ -9,20 +9,20 @@ The main reason to write this, is to provide a simple way in all platforms to in
- Linux: `cd`
- Windows: `cd /c/Users/YOUR_USERNAME`
- Mac: `cd /Users/YOUR_USERNAME`
4. Get godot source code: `git clone https://github.com/godotengine/godot.git`
5. Run command: `cd godot/tools/docker`
6. Run command: `docker build -t godot .`(In Linux run Docker commands with `sudo` or add your user to docker group before run the Docker commands). The godot docker image will be build after a while.
4. Get pandemonium source code: `git clone https://github.com/Relintai/pandemonium_engine`
5. Run command: `cd pandemonium/tools/docker`
6. Run command: `docker build -t pandemonium .`(In Linux run Docker commands with `sudo` or add your user to docker group before run the Docker commands). The pandemonium docker image will be build after a while.
7. Run command:
- Linux: `docker run -it --name=godot-dev -v /home/YOUR_USERNAME/godot:/godot-dev/godot godot`
- Windows: `docker run -it --name=godot-dev -v /c/Users/YOUR_USERNAME/godot:/godot-dev/godot godot`
- Mac: `docker run -it --name=godot-dev -v /Users/YOUR_USERNAME/godot:/godot-dev/godot godot`
You are in the godot-dev container and /godot-dev directory now.
- Linux: `docker run -it --name=pandemonium-dev -v /home/YOUR_USERNAME/pandemonium:/pandemonium-dev/pandemonium pandemonium`
- Windows: `docker run -it --name=pandemonium-dev -v /c/Users/YOUR_USERNAME/pandemonium:/pandemonium-dev/pandemonium pandemonium`
- Mac: `docker run -it --name=pandemonium-dev -v /Users/YOUR_USERNAME/pandemonium:/pandemonium-dev/pandemonium pandemonium`
You are in the pandemonium-dev container and /pandemonium-dev directory now.
8. Run `./install-android-tools` to download and install all android development tools.
9. Run command: `source ~/.bashrc`
10. Run command: `cd godot`
10. Run command: `cd pandemonium`
11. Run command: `scons p=android target=release` to test everything is ok. You can set platform to x11, windows, android, haiku and server.
After use and exit, you can use this environment again by open terminal and type commands: `docker start godot-dev && docker attach godot-dev`.
After use and exit, you can use this environment again by open terminal and type commands: `docker start pandemonium-dev && docker attach pandemonium-dev`.
### Windows and Mac stuffs:
@ -32,7 +32,7 @@ After use and exit, you can use this environment again by open terminal and type
- Open "Oracle VM VirtualBox".
- In settings of default VM increase CPU cores and RAM to suitable values.
- Run command: `docker-machine start`
- Run command: `docker start godot-dev && docker attach godot-dev`
- Run command: `docker start pandemonium-dev && docker attach pandemonium-dev`
- ssh to VM(can be useful sometimes):
- `docker-machine ssh`

10
misc/dist/docker/scripts/install-android-tools vendored
View File

@ -1,9 +1,9 @@
#!/bin/bash
BASH_RC=~/.bashrc
GODOT_BUILD_TOOLS_PATH=/godot-dev/build-tools
mkdir -p $GODOT_BUILD_TOOLS_PATH
cd $GODOT_BUILD_TOOLS_PATH
PANDEMONIUM_BUILD_TOOLS_PATH=/pandemonium-dev/build-tools
mkdir -p $PANDEMONIUM_BUILD_TOOLS_PATH
cd $PANDEMONIUM_BUILD_TOOLS_PATH
ANDROID_BASE_URL=http://dl.google.com/android
@ -11,14 +11,14 @@ ANDROID_SDK_RELEASE=android-sdk_r24.4.1
ANDROID_SDK_DIR=android-sdk-linux
ANDROID_SDK_FILENAME=$ANDROID_SDK_RELEASE-linux.tgz
ANDROID_SDK_URL=$ANDROID_BASE_URL/$ANDROID_SDK_FILENAME
ANDROID_SDK_PATH=$GODOT_BUILD_TOOLS_PATH/$ANDROID_SDK_DIR
ANDROID_SDK_PATH=$PANDEMONIUM_BUILD_TOOLS_PATH/$ANDROID_SDK_DIR
ANDROID_SDK_SHA1=725bb360f0f7d04eaccff5a2d57abdd49061326d
ANDROID_NDK_RELEASE=android-ndk-r10e
ANDROID_NDK_DIR=$ANDROID_NDK_RELEASE
ANDROID_NDK_FILENAME=$ANDROID_NDK_RELEASE-linux-x86_64.bin
ANDROID_NDK_URL=$ANDROID_BASE_URL/ndk/$ANDROID_NDK_FILENAME
ANDROID_NDK_PATH=$GODOT_BUILD_TOOLS_PATH/$ANDROID_NDK_DIR
ANDROID_NDK_PATH=$PANDEMONIUM_BUILD_TOOLS_PATH/$ANDROID_NDK_DIR
ANDROID_NDK_MD5=19af543b068bdb7f27787c2bc69aba7f
echo

1344
misc/dist/html/editor.html vendored
View File

File diff suppressed because it is too large Load Diff

458
misc/dist/html/full-size.html vendored
View File

@ -1,245 +1,275 @@
<!DOCTYPE html>
<html xmlns='http://www.w3.org/1999/xhtml' lang='' xml:lang=''>
<head>
<meta charset='utf-8' />
<meta name='viewport' content='width=device-width, user-scalable=no' />
<title>$GODOT_PROJECT_NAME</title>
<style type='text/css'>
<meta charset='utf-8' />
<meta name='viewport' content='width=device-width, user-scalable=no' />
<title>$PANDEMONIUM_PROJECT_NAME</title>
<style type='text/css'>
body {
touch-action: none;
margin: 0;
border: 0 none;
padding: 0;
text-align: center;
background-color: black;
}
body {
touch-action: none;
margin: 0;
border: 0 none;
padding: 0;
text-align: center;
background-color: black;
}
#canvas {
display: block;
margin: 0;
color: white;
}
#canvas {
display: block;
margin: 0;
color: white;
}
#canvas:focus {
outline: none;
}
#canvas:focus {
outline: none;
}
.godot {
font-family: 'Noto Sans', 'Droid Sans', Arial, sans-serif;
color: #e0e0e0;
background-color: #3b3943;
background-image: linear-gradient(to bottom, #403e48, #35333c);
border: 1px solid #45434e;
box-shadow: 0 0 1px 1px #2f2d35;
}
.pandemonium {
font-family: 'Noto Sans', 'Droid Sans', Arial, sans-serif;
color: #e0e0e0;
background-color: #3b3943;
background-image: linear-gradient(to bottom, #403e48, #35333c);
border: 1px solid #45434e;
box-shadow: 0 0 1px 1px #2f2d35;
}
/* Status display
/* Status display
* ============== */
#status {
position: absolute;
left: 0;
top: 0;
right: 0;
bottom: 0;
display: flex;
justify-content: center;
align-items: center;
/* don't consume click events - make children visible explicitly */
visibility: hidden;
}
#status {
position: absolute;
left: 0;
top: 0;
right: 0;
bottom: 0;
display: flex;
justify-content: center;
align-items: center;
/* don't consume click events - make children visible explicitly */
visibility: hidden;
}
#status-progress {
width: 366px;
height: 7px;
background-color: #38363A;
border: 1px solid #444246;
padding: 1px;
box-shadow: 0 0 2px 1px #1B1C22;
border-radius: 2px;
visibility: visible;
}
#status-progress {
width: 366px;
height: 7px;
background-color: #38363A;
border: 1px solid #444246;
padding: 1px;
box-shadow: 0 0 2px 1px #1B1C22;
border-radius: 2px;
visibility: visible;
}
@media only screen and (orientation:portrait) {
#status-progress {
width: 61.8%;
}
}
@media only screen and (orientation:portrait) {
#status-progress {
width: 61.8%;
}
}
#status-progress-inner {
height: 100%;
width: 0;
box-sizing: border-box;
transition: width 0.5s linear;
background-color: #202020;
border: 1px solid #222223;
box-shadow: 0 0 1px 1px #27282E;
border-radius: 3px;
}
#status-progress-inner {
height: 100%;
width: 0;
box-sizing: border-box;
transition: width 0.5s linear;
background-color: #202020;
border: 1px solid #222223;
box-shadow: 0 0 1px 1px #27282E;
border-radius: 3px;
}
#status-indeterminate {
height: 42px;
visibility: visible;
position: relative;
}
#status-indeterminate {
height: 42px;
visibility: visible;
position: relative;
}
#status-indeterminate > div {
width: 4.5px;
height: 0;
border-style: solid;
border-width: 9px 3px 0 3px;
border-color: #2b2b2b transparent transparent transparent;
transform-origin: center 21px;
position: absolute;
}
#status-indeterminate>div {
width: 4.5px;
height: 0;
border-style: solid;
border-width: 9px 3px 0 3px;
border-color: #2b2b2b transparent transparent transparent;
transform-origin: center 21px;
position: absolute;
}
#status-indeterminate > div:nth-child(1) { transform: rotate( 22.5deg); }
#status-indeterminate > div:nth-child(2) { transform: rotate( 67.5deg); }
#status-indeterminate > div:nth-child(3) { transform: rotate(112.5deg); }
#status-indeterminate > div:nth-child(4) { transform: rotate(157.5deg); }
#status-indeterminate > div:nth-child(5) { transform: rotate(202.5deg); }
#status-indeterminate > div:nth-child(6) { transform: rotate(247.5deg); }
#status-indeterminate > div:nth-child(7) { transform: rotate(292.5deg); }
#status-indeterminate > div:nth-child(8) { transform: rotate(337.5deg); }
#status-indeterminate>div:nth-child(1) {
transform: rotate(22.5deg);
}
#status-notice {
margin: 0 100px;
line-height: 1.3;
visibility: visible;
padding: 4px 6px;
visibility: visible;
}
</style>
$GODOT_HEAD_INCLUDE
#status-indeterminate>div:nth-child(2) {
transform: rotate(67.5deg);
}
#status-indeterminate>div:nth-child(3) {
transform: rotate(112.5deg);
}
#status-indeterminate>div:nth-child(4) {
transform: rotate(157.5deg);
}
#status-indeterminate>div:nth-child(5) {
transform: rotate(202.5deg);
}
#status-indeterminate>div:nth-child(6) {
transform: rotate(247.5deg);
}
#status-indeterminate>div:nth-child(7) {
transform: rotate(292.5deg);
}
#status-indeterminate>div:nth-child(8) {
transform: rotate(337.5deg);
}
#status-notice {
margin: 0 100px;
line-height: 1.3;
visibility: visible;
padding: 4px 6px;
visibility: visible;
}
</style>
$PANDEMONIUM_HEAD_INCLUDE
</head>
<body>
<canvas id='canvas'>
HTML5 canvas appears to be unsupported in the current browser.<br />
Please try updating or use a different browser.
</canvas>
<div id='status'>
<div id='status-progress' style='display: none;' oncontextmenu='event.preventDefault();'><div id ='status-progress-inner'></div></div>
<div id='status-indeterminate' style='display: none;' oncontextmenu='event.preventDefault();'>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
</div>
<div id='status-notice' class='godot' style='display: none;'></div>
</div>
<canvas id='canvas'>
HTML5 canvas appears to be unsupported in the current browser.<br />
Please try updating or use a different browser.
</canvas>
<div id='status'>
<div id='status-progress' style='display: none;' oncontextmenu='event.preventDefault();'>
<div id='status-progress-inner'></div>
</div>
<div id='status-indeterminate' style='display: none;' oncontextmenu='event.preventDefault();'>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
<div></div>
</div>
<div id='status-notice' class='pandemonium' style='display: none;'></div>
</div>
<script type='text/javascript' src='$GODOT_URL'></script>
<script type='text/javascript'>//<![CDATA[
<script type='text/javascript' src='$PANDEMONIUM_URL'></script>
<script type='text/javascript'>
//<![CDATA[
const GODOT_CONFIG = $GODOT_CONFIG;
var engine = new Engine(GODOT_CONFIG);
const PANDEMONIUM_CONFIG = $PANDEMONIUM_CONFIG;
var engine = new Engine(PANDEMONIUM_CONFIG);
(function() {
const INDETERMINATE_STATUS_STEP_MS = 100;
var statusProgress = document.getElementById('status-progress');
var statusProgressInner = document.getElementById('status-progress-inner');
var statusIndeterminate = document.getElementById('status-indeterminate');
var statusNotice = document.getElementById('status-notice');
(function() {
const INDETERMINATE_STATUS_STEP_MS = 100;
var statusProgress = document.getElementById('status-progress');
var statusProgressInner = document.getElementById('status-progress-inner');
var statusIndeterminate = document.getElementById('status-indeterminate');
var statusNotice = document.getElementById('status-notice');
var initializing = true;
var statusMode = 'hidden';
var initializing = true;
var statusMode = 'hidden';
var animationCallbacks = [];
function animate(time) {
animationCallbacks.forEach(callback => callback(time));
requestAnimationFrame(animate);
}
requestAnimationFrame(animate);
var animationCallbacks = [];
function setStatusMode(mode) {
function animate(time) {
animationCallbacks.forEach(callback => callback(time));
requestAnimationFrame(animate);
}
requestAnimationFrame(animate);
if (statusMode === mode || !initializing)
return;
[statusProgress, statusIndeterminate, statusNotice].forEach(elem => {
elem.style.display = 'none';
});
animationCallbacks = animationCallbacks.filter(function(value) {
return (value != animateStatusIndeterminate);
});
switch (mode) {
case 'progress':
statusProgress.style.display = 'block';
break;
case 'indeterminate':
statusIndeterminate.style.display = 'block';
animationCallbacks.push(animateStatusIndeterminate);
break;
case 'notice':
statusNotice.style.display = 'block';
break;
case 'hidden':
break;
default:
throw new Error('Invalid status mode');
}
statusMode = mode;
}
function setStatusMode(mode) {
function animateStatusIndeterminate(ms) {
var i = Math.floor(ms / INDETERMINATE_STATUS_STEP_MS % 8);
if (statusIndeterminate.children[i].style.borderTopColor == '') {
Array.prototype.slice.call(statusIndeterminate.children).forEach(child => {
child.style.borderTopColor = '';
});
statusIndeterminate.children[i].style.borderTopColor = '#dfdfdf';
}
}
if (statusMode === mode || !initializing)
return;
[statusProgress, statusIndeterminate, statusNotice].forEach(elem => {
elem.style.display = 'none';
});
animationCallbacks = animationCallbacks.filter(function(value) {
return (value != animateStatusIndeterminate);
});
switch (mode) {
case 'progress':
statusProgress.style.display = 'block';
break;
case 'indeterminate':
statusIndeterminate.style.display = 'block';
animationCallbacks.push(animateStatusIndeterminate);
break;
case 'notice':
statusNotice.style.display = 'block';
break;
case 'hidden':
break;
default:
throw new Error('Invalid status mode');
}
statusMode = mode;
}
function setStatusNotice(text) {
while (statusNotice.lastChild) {
statusNotice.removeChild(statusNotice.lastChild);
}
var lines = text.split('\n');
lines.forEach((line) => {
statusNotice.appendChild(document.createTextNode(line));
statusNotice.appendChild(document.createElement('br'));
});
};
function animateStatusIndeterminate(ms) {
var i = Math.floor(ms / INDETERMINATE_STATUS_STEP_MS % 8);
if (statusIndeterminate.children[i].style.borderTopColor == '') {
Array.prototype.slice.call(statusIndeterminate.children).forEach(child => {
child.style.borderTopColor = '';
});
statusIndeterminate.children[i].style.borderTopColor = '#dfdfdf';
}
}
function displayFailureNotice(err) {
var msg = err.message || err;
console.error(msg);
setStatusNotice(msg);
setStatusMode('notice');
initializing = false;
};
function setStatusNotice(text) {
while (statusNotice.lastChild) {
statusNotice.removeChild(statusNotice.lastChild);
}
var lines = text.split('\n');
lines.forEach((line) => {
statusNotice.appendChild(document.createTextNode(line));
statusNotice.appendChild(document.createElement('br'));
});
};
if (!Engine.isWebGLAvailable()) {
displayFailureNotice('WebGL not available');
} else {
setStatusMode('indeterminate');
engine.startGame({
'onProgress': function (current, total) {
if (total > 0) {
statusProgressInner.style.width = current/total * 100 + '%';
setStatusMode('progress');
if (current === total) {
// wait for progress bar animation
setTimeout(() => {
setStatusMode('indeterminate');
}, 500);
}
} else {
setStatusMode('indeterminate');
}
},
}).then(() => {
setStatusMode('hidden');
initializing = false;
}, displayFailureNotice);
}
})();
//]]></script>
function displayFailureNotice(err) {
var msg = err.message || err;
console.error(msg);
setStatusNotice(msg);
setStatusMode('notice');
initializing = false;
};
if (!Engine.isWebGLAvailable()) {
displayFailureNotice('WebGL not available');
} else {
setStatusMode('indeterminate');
engine.startGame({
'onProgress': function(current, total) {
if (total > 0) {
statusProgressInner.style.width = current / total * 100 + '%';
setStatusMode('progress');
if (current === total) {
// wait for progress bar animation
setTimeout(() => {
setStatusMode('indeterminate');
}, 500);
}
} else {
setStatusMode('indeterminate');
}
},
}).then(() => {
setStatusMode('hidden');
initializing = false;
}, displayFailureNotice);
}
})();
//]]>
</script>
</body>
</html>
</html>

30
misc/dist/html/manifest.json vendored
View File

@ -1,17 +1,15 @@
{
"name": "Godot Engine Web Editor",
"short_name": "Godot",
"description": "Multi-platform 2D and 3D game engine with a feature-rich editor (Web edition)",
"lang": "en",
"start_url": "./godot.tools.html",
"display": "standalone",
"theme_color": "#202531",
"icons": [
{
"src": "favicon.png",
"sizes": "256x256",
"type": "image/png"
}
],
"background_color": "#333b4f"
}
"name": "Pandemonium Engine Web Editor",
"short_name": "Pandemonium",
"description": "Multi-platform 2D and 3D game engine with a feature-rich editor (Web edition)",
"lang": "en",
"start_url": "./pandemonium.tools.html",
"display": "standalone",
"theme_color": "#202531",
"icons": [{
"src": "favicon.png",
"sizes": "256x256",
"type": "image/png"
}],
"background_color": "#333b4f"
}

165
misc/dist/html/service-worker.js vendored
View File

@ -1,105 +1,104 @@
// This service worker is required to expose an exported Godot project as a
// This service worker is required to expose an exported Pandemonium project as a
// Progressive Web App. It provides an offline fallback page telling the user
// that they need an Internet connection to run the project if desired.
// Incrementing CACHE_VERSION will kick off the install event and force
// previously cached resources to be updated from the network.
const CACHE_VERSION = "@GODOT_VERSION@";
const CACHE_PREFIX = "@GODOT_NAME@-sw-cache-";
const CACHE_VERSION = "@PANDEMONIUM_VERSION@";
const CACHE_PREFIX = "@PANDEMONIUM_NAME@-sw-cache-";
const CACHE_NAME = CACHE_PREFIX + CACHE_VERSION;
const OFFLINE_URL = "@GODOT_OFFLINE_PAGE@";
const OFFLINE_URL = "@PANDEMONIUM_OFFLINE_PAGE@";
// Files that will be cached on load.
const CACHED_FILES = @GODOT_CACHE@;
const CACHED_FILES = @PANDEMONIUM_CACHE @;
// Files that we might not want the user to preload, and will only be cached on first load.
const CACHABLE_FILES = @GODOT_OPT_CACHE@;
const CACHABLE_FILES = @PANDEMONIUM_OPT_CACHE @;
const FULL_CACHE = CACHED_FILES.concat(CACHABLE_FILES);
self.addEventListener("install", (event) => {
event.waitUntil(caches.open(CACHE_NAME).then(cache => cache.addAll(CACHED_FILES)));
event.waitUntil(caches.open(CACHE_NAME).then(cache => cache.addAll(CACHED_FILES)));
});
self.addEventListener("activate", (event) => {
event.waitUntil(caches.keys().then(
function (keys) {
// Remove old caches.
return Promise.all(keys.filter(key => key.startsWith(CACHE_PREFIX) && key != CACHE_NAME).map(key => caches.delete(key)));
}).then(function() {
// Enable navigation preload if available.
return ("navigationPreload" in self.registration) ? self.registration.navigationPreload.enable() : Promise.resolve();
})
);
event.waitUntil(caches.keys().then(
function(keys) {
// Remove old caches.
return Promise.all(keys.filter(key => key.startsWith(CACHE_PREFIX) && key != CACHE_NAME).map(key => caches.delete(key)));
}).then(function() {
// Enable navigation preload if available.
return ("navigationPreload" in self.registration) ? self.registration.navigationPreload.enable() : Promise.resolve();
}));
});
async function fetchAndCache(event, cache, isCachable) {
// Use the preloaded response, if it's there
let response = await event.preloadResponse;
if (!response) {
// Or, go over network.
response = await self.fetch(event.request);
}
if (isCachable) {
// And update the cache
cache.put(event.request, response.clone());
}
return response;
// Use the preloaded response, if it's there
let response = await event.preloadResponse;
if (!response) {
// Or, go over network.
response = await self.fetch(event.request);
}
if (isCachable) {
// And update the cache
cache.put(event.request, response.clone());
}
return response;
}
self.addEventListener("fetch", (event) => {
const isNavigate = event.request.mode === "navigate";
const url = event.request.url || "";
const referrer = event.request.referrer || "";
const base = referrer.slice(0, referrer.lastIndexOf("/") + 1);
const local = url.startsWith(base) ? url.replace(base, "") : "";
const isCachable = FULL_CACHE.some(v => v === local) || (base === referrer && base.endsWith(CACHED_FILES[0]));
if (isNavigate || isCachable) {
event.respondWith(async function () {
// Try to use cache first
const cache = await caches.open(CACHE_NAME);
if (event.request.mode === "navigate") {
// Check if we have full cache during HTML page request.
const fullCache = await Promise.all(FULL_CACHE.map(name => cache.match(name)));
const missing = fullCache.some(v => v === undefined);
if (missing) {
try {
// Try network if some cached file is missing (so we can display offline page in case).
return await fetchAndCache(event, cache, isCachable);
} catch (e) {
// And return the hopefully always cached offline page in case of network failure.
console.error("Network error: ", e);
return await caches.match(OFFLINE_URL);
}
}
}
const cached = await cache.match(event.request);
if (cached) {
return cached;
} else {
// Try network if don't have it in cache.
return await fetchAndCache(event, cache, isCachable);
}
}());
}
const isNavigate = event.request.mode === "navigate";
const url = event.request.url || "";
const referrer = event.request.referrer || "";
const base = referrer.slice(0, referrer.lastIndexOf("/") + 1);
const local = url.startsWith(base) ? url.replace(base, "") : "";
const isCachable = FULL_CACHE.some(v => v === local) || (base === referrer && base.endsWith(CACHED_FILES[0]));
if (isNavigate || isCachable) {
event.respondWith(async function() {
// Try to use cache first
const cache = await caches.open(CACHE_NAME);
if (event.request.mode === "navigate") {
// Check if we have full cache during HTML page request.
const fullCache = await Promise.all(FULL_CACHE.map(name => cache.match(name)));
const missing = fullCache.some(v => v === undefined);
if (missing) {
try {
// Try network if some cached file is missing (so we can display offline page in case).
return await fetchAndCache(event, cache, isCachable);
} catch (e) {
// And return the hopefully always cached offline page in case of network failure.
console.error("Network error: ", e);
return await caches.match(OFFLINE_URL);
}
}
}
const cached = await cache.match(event.request);
if (cached) {
return cached;
} else {
// Try network if don't have it in cache.
return await fetchAndCache(event, cache, isCachable);
}
}());
}
});
self.addEventListener("message", (event) => {
// No cross origin
if (event.origin != self.origin) {
return;
}
const id = event.source.id || "";
const msg = event.data || "";
// Ensure it's one of our clients.
self.clients.get(id).then(function (client) {
if (!client) {
return; // Not a valid client.
}
if (msg === "claim") {
self.skipWaiting().then(() => self.clients.claim());
} else if (msg === "clear") {
caches.delete(CACHE_NAME);
} else if (msg === "update") {
self.skipWaiting().then(() => self.clients.claim()).then(() => self.clients.matchAll()).then(all => all.forEach(c => c.navigate(c.url)));
} else {
onClientMessage(event);
}
});
});
// No cross origin
if (event.origin != self.origin) {
return;
}
const id = event.source.id || "";
const msg = event.data || "";
// Ensure it's one of our clients.
self.clients.get(id).then(function(client) {
if (!client) {
return; // Not a valid client.
}
if (msg === "claim") {
self.skipWaiting().then(() => self.clients.claim());
} else if (msg === "clear") {
caches.delete(CACHE_NAME);
} else if (msg === "update") {
self.skipWaiting().then(() => self.clients.claim()).then(() => self.clients.matchAll()).then(all => all.forEach(c => c.navigate(c.url)));
} else {
onClientMessage(event);
}
});
});

4
misc/dist/ios_xcode/libgodot.iphone.debug.xcframework/Info.plist → misc/dist/ios_xcode/libpandemonium.iphone.debug.xcframework/Info.plist vendored
View File

@ -8,7 +8,7 @@
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libgodot.a</string>
<string>libpandemonium.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
@ -20,7 +20,7 @@
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libgodot.a</string>
<string>libpandemonium.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>

0
misc/dist/ios_xcode/godot_ios/dylibs/empty → misc/dist/ios_xcode/libpandemonium.iphone.debug.xcframework/ios-arm64/empty vendored
View File

0
misc/dist/ios_xcode/libgodot.iphone.debug.xcframework/ios-arm64/empty → misc/dist/ios_xcode/libpandemonium.iphone.debug.xcframework/ios-arm64_x86_64-simulator/empty vendored
View File

4
misc/dist/ios_xcode/libgodot.iphone.release.xcframework/Info.plist → misc/dist/ios_xcode/libpandemonium.iphone.release.xcframework/Info.plist vendored
View File

@ -8,7 +8,7 @@
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>libgodot.a</string>
<string>libpandemonium.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
@ -20,7 +20,7 @@
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libgodot.a</string>
<string>libpandemonium.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>

Some files were not shown because too many files have changed in this diff Show More