mirror of
https://github.com/4ian/GDevelop.git
synced 2025-10-15 10:19:04 +00:00
Compare commits
129 Commits
v5.2.176
...
experiment
Author | SHA1 | Date | |
---|---|---|---|
![]() |
afc2d284c1 | ||
![]() |
c2ed4e9910 | ||
![]() |
8d2341bd21 | ||
![]() |
b187d9ec98 | ||
![]() |
d2da102830 | ||
![]() |
a8f9df3dac | ||
![]() |
35db56d778 | ||
![]() |
27efe8e3dd | ||
![]() |
3584ee2aaf | ||
![]() |
19a762fb60 | ||
![]() |
8a6dd8b940 | ||
![]() |
2173b49b19 | ||
![]() |
caf2752acb | ||
![]() |
e3291b515d | ||
![]() |
c1627b5ab2 | ||
![]() |
7db5b97c45 | ||
![]() |
425a0e92ca | ||
![]() |
c2dfe579af | ||
![]() |
4ea6fb78bd | ||
![]() |
8e668db6ea | ||
![]() |
88063a4cad | ||
![]() |
b180f5032e | ||
![]() |
29e7f7d7a4 | ||
![]() |
547f1e4bce | ||
![]() |
9e176d91ec | ||
![]() |
cac59d4727 | ||
![]() |
4f98ffa9ab | ||
![]() |
7229406cfb | ||
![]() |
d39cfd16a2 | ||
![]() |
2965f374bb | ||
![]() |
2d5b2a49e7 | ||
![]() |
05df9cb599 | ||
![]() |
7b28d2525e | ||
![]() |
533e61cdbc | ||
![]() |
3a823113f1 | ||
![]() |
17bc8b584d | ||
![]() |
dbaf8a6569 | ||
![]() |
fcbc538c30 | ||
![]() |
decd96c52f | ||
![]() |
8dbf9c99ce | ||
![]() |
1318523804 | ||
![]() |
8ef5e2c1ed | ||
![]() |
d945426068 | ||
![]() |
8eb07a492f | ||
![]() |
37c9dd95ce | ||
![]() |
a6d837cbe6 | ||
![]() |
f6539626d3 | ||
![]() |
e0df9b0ff3 | ||
![]() |
0b50231027 | ||
![]() |
94c9924a88 | ||
![]() |
581cc5837a | ||
![]() |
ff77d107b2 | ||
![]() |
3a5198cb34 | ||
![]() |
c92025549d | ||
![]() |
600b307e7e | ||
![]() |
297fade0bd | ||
![]() |
84d7500eab | ||
![]() |
f99c4ab948 | ||
![]() |
5fe4f23c83 | ||
![]() |
8820bd45e4 | ||
![]() |
5e16968f37 | ||
![]() |
6b6179ff22 | ||
![]() |
94bcd87a9f | ||
![]() |
356a1974ef | ||
![]() |
345bad9876 | ||
![]() |
0b8d843a73 | ||
![]() |
9f0c987ec7 | ||
![]() |
0e79209d2b | ||
![]() |
f991c09c39 | ||
![]() |
6e24dfa9b8 | ||
![]() |
a3cd00dc94 | ||
![]() |
300c011151 | ||
![]() |
230d410469 | ||
![]() |
402e54f706 | ||
![]() |
dc29c27272 | ||
![]() |
462bb84c51 | ||
![]() |
a775e79bae | ||
![]() |
bc8c867f23 | ||
![]() |
f34bf2b7b4 | ||
![]() |
e2d482e1aa | ||
![]() |
0724ae34d9 | ||
![]() |
2fc1c2fd86 | ||
![]() |
9a42ae11ad | ||
![]() |
32773e06f6 | ||
![]() |
00508df014 | ||
![]() |
c3cf5b7002 | ||
![]() |
df7fab84b8 | ||
![]() |
95a0012c5e | ||
![]() |
4bf644f9f2 | ||
![]() |
79cad1da3a | ||
![]() |
ffc6f5786b | ||
![]() |
07df65f8c2 | ||
![]() |
61f8f0ed66 | ||
![]() |
c24e2e5ace | ||
![]() |
25c72a6d1f | ||
![]() |
6153b23e7d | ||
![]() |
1b7ccfded3 | ||
![]() |
ec57a0a80d | ||
![]() |
95a9e37aba | ||
![]() |
787274f7fa | ||
![]() |
ceb24f0edb | ||
![]() |
028bf7a70d | ||
![]() |
08471d0356 | ||
![]() |
921add6665 | ||
![]() |
dabff06891 | ||
![]() |
967033c407 | ||
![]() |
0809749ddc | ||
![]() |
8a27801355 | ||
![]() |
20cba9d7ed | ||
![]() |
3878b93c94 | ||
![]() |
645d5331cb | ||
![]() |
91db750632 | ||
![]() |
740485b54a | ||
![]() |
e960fe7c5b | ||
![]() |
0633c7b474 | ||
![]() |
704bfd40cb | ||
![]() |
310abe7a13 | ||
![]() |
b0f9bed273 | ||
![]() |
766a62ad9b | ||
![]() |
ec6f669d94 | ||
![]() |
36a2408be0 | ||
![]() |
1343210a2b | ||
![]() |
1e76fedd7b | ||
![]() |
a6c4f742c2 | ||
![]() |
e6935206c0 | ||
![]() |
00190de683 | ||
![]() |
7a8c359379 | ||
![]() |
29aa2479f6 | ||
![]() |
7010b6880d |
@@ -30,7 +30,7 @@ jobs:
|
||||
|
||||
- run:
|
||||
name: Install Emscripten (for GDevelop.js)
|
||||
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
|
||||
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
|
||||
|
||||
# GDevelop.js dependencies
|
||||
- restore_cache:
|
||||
@@ -107,7 +107,7 @@ jobs:
|
||||
|
||||
- run:
|
||||
name: Install Emscripten (for GDevelop.js)
|
||||
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
|
||||
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
|
||||
|
||||
- run:
|
||||
name: Install system dependencies for Electron builder
|
||||
@@ -127,7 +127,8 @@ jobs:
|
||||
# Build GDevelop.js (and run tests to ensure it works)
|
||||
- run:
|
||||
name: Build GDevelop.js
|
||||
command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
|
||||
# Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
|
||||
command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
|
||||
|
||||
# GDevelop IDE dependencies (after building GDevelop.js to avoid downloading a pre-built version)
|
||||
- run:
|
||||
@@ -184,7 +185,7 @@ jobs:
|
||||
|
||||
- run:
|
||||
name: Install Emscripten (for GDevelop.js)
|
||||
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
|
||||
command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
|
||||
|
||||
# GDevelop.js dependencies
|
||||
- restore_cache:
|
||||
@@ -200,7 +201,8 @@ jobs:
|
||||
# Build GDevelop.js (and run tests to ensure it works)
|
||||
- run:
|
||||
name: Build GDevelop.js
|
||||
command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test && cd ..
|
||||
# Use "--runInBand" as it's faster and avoid deadlocks on CircleCI Linux machines (probably because limited in processes number).
|
||||
command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && npm test -- --runInBand && cd ..
|
||||
|
||||
- save_cache:
|
||||
paths:
|
||||
|
37
.github/ISSUE_TEMPLATE/--automatic-crash.yml
vendored
Normal file
37
.github/ISSUE_TEMPLATE/--automatic-crash.yml
vendored
Normal file
@@ -0,0 +1,37 @@
|
||||
name: 💥 Automatic crash report
|
||||
description: Do not use this template for bug reports. This template is only for automatic crash reports.
|
||||
body:
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: Describe what you were doing when the crash happened
|
||||
description: If applicable, add screenshots to help explain your problem.
|
||||
placeholder: |
|
||||
1. Went to '...'
|
||||
2. Clicked on '...'
|
||||
3. Scrolled down to '...'
|
||||
4. Saw error
|
||||
- type: input
|
||||
id: gdevelop_version
|
||||
attributes:
|
||||
label: GDevelop version
|
||||
description: |
|
||||
The version of GDevelop used. Leave the prefilled value.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: platform_info
|
||||
attributes:
|
||||
label: Platform info
|
||||
description: |
|
||||
The platform you are using GDevelop on. Leave the prefilled value.
|
||||
- type: textarea
|
||||
id: error_stack
|
||||
attributes:
|
||||
label: Additional error context
|
||||
description: Additonal context about the problem. Leave the prefilled value.
|
||||
- type: textarea
|
||||
id: component_stack
|
||||
attributes:
|
||||
label: Additional component context
|
||||
description: Additonal context about the problem. Leave the prefilled value.
|
11
.github/ISSUE_TEMPLATE/--bug-report.yml
vendored
11
.github/ISSUE_TEMPLATE/--bug-report.yml
vendored
@@ -2,18 +2,21 @@ name: 🐛Bug report
|
||||
description: Create a bug report about GDevelop or the game engine
|
||||
body:
|
||||
- type: checkboxes
|
||||
id: searched_issues
|
||||
attributes:
|
||||
label: Is there an existing issue for this?
|
||||
options:
|
||||
- label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
|
||||
required: true
|
||||
- label: I have searched the [existing issues](https://github.com/4ian/GDevelop/issues)
|
||||
required: true
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: Describe the bug
|
||||
description: A clear and concise description of what the bug is.
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: reproduction_steps
|
||||
attributes:
|
||||
label: Steps to reproduce
|
||||
description: |
|
||||
@@ -27,6 +30,7 @@ body:
|
||||
validations:
|
||||
required: true
|
||||
- type: dropdown
|
||||
id: platform
|
||||
attributes:
|
||||
label: GDevelop platform
|
||||
description: Which platform of GDevelop are you using?
|
||||
@@ -38,6 +42,7 @@ body:
|
||||
validations:
|
||||
required: true
|
||||
- type: input
|
||||
id: gdevelop_version
|
||||
attributes:
|
||||
label: GDevelop version
|
||||
description: |
|
||||
@@ -47,6 +52,7 @@ body:
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: platform_info
|
||||
attributes:
|
||||
label: Platform info
|
||||
value: |
|
||||
@@ -66,6 +72,7 @@ body:
|
||||
|
||||
</details>
|
||||
- type: textarea
|
||||
id: additional_context
|
||||
attributes:
|
||||
label: Additional context
|
||||
description: Add any other context about the problem here.
|
||||
|
@@ -14,7 +14,7 @@ tasks:
|
||||
init: |
|
||||
sudo apt-get update
|
||||
sudo apt install cmake python-is-python3 python3-distutils -y
|
||||
git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
|
||||
git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
|
||||
cd GDevelop.js
|
||||
npm install
|
||||
source ../emsdk/emsdk_env.sh && npm run build -- --dev
|
||||
|
@@ -39,7 +39,7 @@ install:
|
||||
- cd ..
|
||||
# Install Emscripten (for GDevelop.js)
|
||||
- git clone https://github.com/juj/emsdk.git
|
||||
- cd emsdk && ./emsdk install 1.39.6 && ./emsdk activate 1.39.6 && cd ..
|
||||
- cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
|
||||
# Install GDevelop.js dependencies
|
||||
- cd GDevelop.js && npm install && cd ..
|
||||
# Build GDevelop.js
|
||||
|
@@ -46,10 +46,6 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
|
||||
// TODO Add unit tests on this function.
|
||||
|
||||
// TODO Merge with UsedExtensionsFinder.
|
||||
// Default lights rely on the fact that UsedExtensionsFinder doesn't find
|
||||
// extension usages for effects. This has the happy side effect of not
|
||||
// including Three.js when no 3D object are in the scenes.
|
||||
// We need to make something explicit to avoid future bugs.
|
||||
|
||||
// See also gd::Project::ExposeResources for a method that traverse the whole
|
||||
// project (this time for resources) and
|
||||
|
@@ -69,8 +69,36 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
|
||||
}
|
||||
}
|
||||
|
||||
return callStartString + "(" + argumentsStr + ") " + relationalOperator +
|
||||
" " + rhs;
|
||||
auto lhs = callStartString + "(" + argumentsStr + ")";
|
||||
return GenerateRelationalOperation(relationalOperator, lhs, rhs);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Generate a relational operation
|
||||
*
|
||||
* @param relationalOperator the operator
|
||||
* @param lhs the left hand operand
|
||||
* @param rhs the right hand operand
|
||||
* @return gd::String
|
||||
*/
|
||||
gd::String EventsCodeGenerator::GenerateRelationalOperation(
|
||||
const gd::String& relationalOperator,
|
||||
const gd::String& lhs,
|
||||
const gd::String& rhs) {
|
||||
return lhs + " " + GenerateRelationalOperatorCodes(relationalOperator) + " " + rhs;
|
||||
}
|
||||
|
||||
const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
|
||||
if (operatorString == "=") {
|
||||
return "==";
|
||||
}
|
||||
if (operatorString != "<" && operatorString != ">" &&
|
||||
operatorString != "<=" && operatorString != ">=" && operatorString != "!=" &&
|
||||
operatorString != "startsWith" && operatorString != "endsWith" && operatorString != "contains") {
|
||||
cout << "Warning: Bad relational operator: Set to == by default." << endl;
|
||||
return "==";
|
||||
}
|
||||
return operatorString;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -638,18 +666,6 @@ gd::String EventsCodeGenerator::GenerateActionsListCode(
|
||||
return outputCode;
|
||||
}
|
||||
|
||||
const gd::String EventsCodeGenerator::GenerateRelationalOperatorCodes(const gd::String &operatorString) {
|
||||
if (operatorString == "=") {
|
||||
return "==";
|
||||
}
|
||||
if (operatorString != "<" && operatorString != ">" &&
|
||||
operatorString != "<=" && operatorString != ">=" && operatorString != "!=") {
|
||||
cout << "Warning: Bad relational operator: Set to == by default." << endl;
|
||||
return "==";
|
||||
}
|
||||
return operatorString;
|
||||
}
|
||||
|
||||
gd::String EventsCodeGenerator::GenerateParameterCodes(
|
||||
const gd::Expression& parameter,
|
||||
const gd::ParameterMetadata& metadata,
|
||||
@@ -674,7 +690,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
|
||||
argOutput =
|
||||
GenerateObject(parameter.GetPlainString(), metadata.GetType(), context);
|
||||
} else if (metadata.GetType() == "relationalOperator") {
|
||||
argOutput += GenerateRelationalOperatorCodes(parameter.GetPlainString());
|
||||
argOutput += parameter.GetPlainString();
|
||||
argOutput = "\"" + argOutput + "\"";
|
||||
} else if (metadata.GetType() == "operator") {
|
||||
argOutput += parameter.GetPlainString();
|
||||
|
@@ -473,10 +473,15 @@ class GD_CORE_API EventsCodeGenerator {
|
||||
*/
|
||||
size_t GenerateSingleUsageUniqueIdForEventsList();
|
||||
|
||||
virtual gd::String GenerateRelationalOperation(
|
||||
const gd::String& relationalOperator,
|
||||
const gd::String& lhs,
|
||||
const gd::String& rhs);
|
||||
|
||||
protected:
|
||||
virtual const gd::String GenerateRelationalOperatorCodes(
|
||||
const gd::String& operatorString);
|
||||
|
||||
protected:
|
||||
/**
|
||||
* \brief Generate the code for a single parameter.
|
||||
*
|
||||
@@ -732,6 +737,7 @@ class GD_CORE_API EventsCodeGenerator {
|
||||
const std::vector<gd::String>& arguments,
|
||||
const gd::String& callStartString,
|
||||
std::size_t startFromArgument = 0);
|
||||
|
||||
gd::String GenerateOperatorCall(const gd::InstructionMetadata& instrInfos,
|
||||
const std::vector<gd::String>& arguments,
|
||||
const gd::String& callStartString,
|
||||
|
@@ -115,21 +115,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
|
||||
.AddExpression(
|
||||
"GetArgumentAsNumber",
|
||||
_("Get function parameter value"),
|
||||
_("Get function parameter (also called \"argument\") value."),
|
||||
_("Get function parameter (also called \"argument\") value. You don't need this most of the time as you can simply write the parameter name in an expression."),
|
||||
"",
|
||||
"res/function16.png")
|
||||
.AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
|
||||
.SetRelevantForFunctionEventsOnly();
|
||||
.SetRelevantForFunctionEventsOnly()
|
||||
.SetHidden();
|
||||
|
||||
extension
|
||||
.AddStrExpression(
|
||||
"GetArgumentAsString",
|
||||
_("Get function parameter text"),
|
||||
_("Get function parameter (also called \"argument\") text."),
|
||||
_("Get function parameter (also called \"argument\") text. You don't need this most of the time as you can simply write the parameter name in an expression."),
|
||||
"",
|
||||
"res/function16.png")
|
||||
.AddParameter("functionParameterName", _("Parameter name"), "number,string,boolean")
|
||||
.SetRelevantForFunctionEventsOnly();
|
||||
.SetRelevantForFunctionEventsOnly()
|
||||
.SetHidden();
|
||||
|
||||
extension
|
||||
.AddCondition(
|
||||
|
@@ -49,6 +49,7 @@ class GD_CORE_API BuiltinExtensionsImplementer {
|
||||
static void ImplementsAnimatableExtension(gd::PlatformExtension& extension);
|
||||
static void ImplementsEffectExtension(gd::PlatformExtension& extension);
|
||||
static void ImplementsOpacityExtension(gd::PlatformExtension& extension);
|
||||
static void ImplementsTextContainerExtension(gd::PlatformExtension& extension);
|
||||
};
|
||||
|
||||
} // namespace gd
|
||||
|
@@ -396,7 +396,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
|
||||
_("Z order"),
|
||||
_("Modify the Z-order of an object"),
|
||||
_("the z-order"),
|
||||
_("Z order"),
|
||||
_("Layers and cameras"),
|
||||
"res/actions/planicon24.png",
|
||||
"res/actions/planicon.png")
|
||||
|
||||
@@ -550,7 +550,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
|
||||
_("Z-order"),
|
||||
_("Compare the Z-order of the specified object."),
|
||||
_("the Z-order"),
|
||||
_("Z-order"),
|
||||
_("Layer"),
|
||||
"res/conditions/planicon24.png",
|
||||
"res/conditions/planicon.png")
|
||||
|
||||
@@ -617,6 +617,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
|
||||
"number", ParameterOptions::MakeNewOptions())
|
||||
.MarkAsAdvanced();
|
||||
|
||||
// Deprecated
|
||||
obj.AddCondition("AngleOfDisplacement",
|
||||
_("Angle of movement (using forces)"),
|
||||
_("Compare the angle of movement of an object according to "
|
||||
@@ -626,7 +627,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
|
||||
_("Movement using forces"),
|
||||
"res/conditions/vitesse24.png",
|
||||
"res/conditions/vitesse.png")
|
||||
.SetHidden()
|
||||
.AddParameter("object", _("Object"))
|
||||
.AddParameter("expression", _("Angle, in degrees"))
|
||||
.AddParameter("expression", _("Tolerance, in degrees"))
|
||||
.MarkAsAdvanced();
|
||||
|
||||
obj.AddCondition("IsTotalForceAngleAround",
|
||||
_("Angle of movement (using forces)"),
|
||||
_("Compare the angle of movement of an object according to "
|
||||
"the forces applied on it."),
|
||||
_("Angle of movement of _PARAM0_ is _PARAM1_ ± _PARAM2_°"),
|
||||
_("Movement using forces"),
|
||||
"res/conditions/vitesse24.png",
|
||||
"res/conditions/vitesse.png")
|
||||
.AddParameter("object", _("Object"))
|
||||
.AddParameter("expression", _("Angle, in degrees"))
|
||||
.AddParameter("expression", _("Tolerance, in degrees"))
|
||||
@@ -1137,7 +1151,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
|
||||
obj.AddExpression("ZOrder",
|
||||
_("Z-order"),
|
||||
_("Z-order of an object"),
|
||||
_("Visibility"),
|
||||
"",
|
||||
"res/actions/planicon.png")
|
||||
.AddParameter("object", _("Object"));
|
||||
|
||||
@@ -1610,7 +1624,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
|
||||
_("Cast a ray from _PARAM1_;_PARAM2_, angle: _PARAM3_ and max "
|
||||
"distance: _PARAM4_px, against _PARAM0_, and save the "
|
||||
"result in _PARAM5_, _PARAM6_"),
|
||||
"",
|
||||
_("Collision"),
|
||||
"res/conditions/raycast24.png",
|
||||
"res/conditions/raycast.png")
|
||||
.AddParameter("objectList", _("Objects to test against the ray"))
|
||||
@@ -1641,7 +1655,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
|
||||
_("Cast a ray from _PARAM1_;_PARAM2_ to _PARAM3_;_PARAM4_ "
|
||||
"against _PARAM0_, and save the "
|
||||
"result in _PARAM5_, _PARAM6_"),
|
||||
"",
|
||||
_("Collision"),
|
||||
"res/conditions/raycast24.png",
|
||||
"res/conditions/raycast.png")
|
||||
.AddParameter("objectList", _("Objects to test against the ray"))
|
||||
|
@@ -327,7 +327,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
|
||||
.AddParameter("expression", _("Camera number (default : 0)"), "", true)
|
||||
.SetDefaultValue("0");
|
||||
|
||||
// TODO Deprecated: hide this action in a future release.
|
||||
extension
|
||||
.AddAction(
|
||||
"FixCamera",
|
||||
@@ -339,6 +338,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
|
||||
"",
|
||||
"res/actions/camera24.png",
|
||||
"res/actions/camera.png")
|
||||
.SetHidden()
|
||||
.AddCodeOnlyParameter("currentScene", "")
|
||||
.AddParameter("objectPtr", _("Object"))
|
||||
.AddParameter("expression",
|
||||
@@ -386,7 +386,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
|
||||
_("Center the camera on an object"),
|
||||
_("Center the camera on the specified object."),
|
||||
_("Center camera on _PARAM1_ (layer: _PARAM3_)"),
|
||||
"",
|
||||
_("Layers and cameras"),
|
||||
"res/actions/camera24.png",
|
||||
"res/actions/camera.png")
|
||||
.AddCodeOnlyParameter("currentScene", "")
|
||||
|
@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
|
||||
"Florian Rival",
|
||||
"Open source (MIT License)")
|
||||
.SetExtensionHelpPath("/objects");
|
||||
extension.AddInstructionOrExpressionGroupMetadata(_("Animatable capability"))
|
||||
.SetIcon("res/actions/animation24.png");
|
||||
extension.AddInstructionOrExpressionGroupMetadata(_("Animations and images"))
|
||||
.SetIcon("res/actions/animation24.png");
|
||||
|
||||
@@ -42,7 +44,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
|
||||
"number",
|
||||
"Index",
|
||||
_("Animation (by number)"),
|
||||
_("the number of the animation played by the object (the number from "
|
||||
_("the animation played by the object using the animation number (from "
|
||||
"the animations list)"),
|
||||
_("the number of the animation"),
|
||||
_("Animations and images"),
|
||||
@@ -53,6 +55,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
|
||||
"number", gd::ParameterOptions::MakeNewOptions().SetDescription(
|
||||
_("Animation index")))
|
||||
.MarkAsSimple();
|
||||
aut.GetAllExpressions()["Index"].SetGroup("");
|
||||
|
||||
aut.AddExpressionAndConditionAndAction(
|
||||
"string",
|
||||
@@ -69,6 +72,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
|
||||
"objectAnimationName", gd::ParameterOptions::MakeNewOptions().SetDescription(
|
||||
_("Animation name")))
|
||||
.MarkAsSimple();
|
||||
aut.GetAllStrExpressions()["Name"].SetGroup("");
|
||||
|
||||
aut.AddScopedAction("PauseAnimation",
|
||||
_("Pause the animation"),
|
||||
@@ -107,6 +111,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
|
||||
"number", gd::ParameterOptions::MakeNewOptions().SetDescription(
|
||||
_("Speed scale")))
|
||||
.MarkAsSimple();
|
||||
aut.GetAllExpressions()["SpeedScale"].SetGroup("");
|
||||
|
||||
aut.AddScopedCondition("IsAnimationPaused",
|
||||
_("Animation paused"),
|
||||
@@ -130,6 +135,31 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAnimatableExtension(
|
||||
.AddParameter("object", _("Object"))
|
||||
.AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
|
||||
.MarkAsSimple();
|
||||
|
||||
aut.AddExpressionAndConditionAndAction(
|
||||
"number",
|
||||
"ElapsedTime",
|
||||
_("Animation elapsed time"),
|
||||
_("the elapsed time from the beginning of the animation (in seconds)"),
|
||||
_("the animation elapsed time"),
|
||||
_("Animations and images"),
|
||||
"res/actions/animation24.png")
|
||||
.AddParameter("object", _("Object"))
|
||||
.AddParameter("behavior", _("Behavior"), "AnimatableBehavior")
|
||||
.UseStandardParameters(
|
||||
"number", gd::ParameterOptions::MakeNewOptions().SetDescription(
|
||||
_("Elapsed time (in seconds)")))
|
||||
.MarkAsAdvanced();
|
||||
aut.GetAllExpressions()["ElapsedTime"].SetGroup("");
|
||||
|
||||
aut.AddExpression(
|
||||
"Duration",
|
||||
_("Animation duration"),
|
||||
_("Return the current animation duration (in seconds)."),
|
||||
_("Animations and images"),
|
||||
"res/actions/animation24.png")
|
||||
.AddParameter("object", _("Object"))
|
||||
.AddParameter("behavior", _("Behavior"), "AnimatableBehavior");
|
||||
}
|
||||
|
||||
} // namespace gd
|
||||
|
@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
|
||||
"Florian Rival",
|
||||
"Open source (MIT License)")
|
||||
.SetExtensionHelpPath("/objects");
|
||||
extension.AddInstructionOrExpressionGroupMetadata(_("Opacity capability"))
|
||||
.SetIcon("res/actions/opacity24.png");
|
||||
extension.AddInstructionOrExpressionGroupMetadata(_("Visibility"))
|
||||
.SetIcon("res/actions/opacity24.png");
|
||||
|
||||
@@ -54,6 +56,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsOpacityExtension(
|
||||
_("Opacity (0-255)")))
|
||||
.SetFunctionName("setOpacity")
|
||||
.SetGetter("getOpacity");
|
||||
aut.GetAllExpressions()["Value"].SetGroup("");
|
||||
}
|
||||
|
||||
} // namespace gd
|
||||
|
@@ -23,6 +23,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
|
||||
"Florian Rival",
|
||||
"Open source (MIT License)")
|
||||
.SetExtensionHelpPath("/objects");
|
||||
extension.AddInstructionOrExpressionGroupMetadata(_("Scalable capability"))
|
||||
.SetIcon("res/actions/scale24_black.png");
|
||||
extension.AddInstructionOrExpressionGroupMetadata(_("Size"))
|
||||
.SetIcon("res/actions/scale24_black.png");
|
||||
|
||||
@@ -44,7 +46,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
|
||||
_("Scale"),
|
||||
_("the scale of the object (default scale is 1)"),
|
||||
_("the scale"),
|
||||
_("Scale"),
|
||||
_("Size"),
|
||||
"res/actions/scale24_black.png")
|
||||
.AddParameter("object", _("Object"))
|
||||
.AddParameter("behavior", _("Behavior"), "ScalableBehavior")
|
||||
@@ -53,6 +55,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
|
||||
gd::ParameterOptions::MakeNewOptions().SetDescription(
|
||||
_("Scale (1 by default)")))
|
||||
.MarkAsAdvanced();
|
||||
aut.GetAllExpressions()["Value"].SetGroup("");
|
||||
|
||||
aut.AddExpressionAndConditionAndAction(
|
||||
"number",
|
||||
@@ -60,7 +63,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
|
||||
_("Scale on X axis"),
|
||||
_("the scale on X axis of the object (default scale is 1)"),
|
||||
_("the scale on X axis"),
|
||||
_("Scale"),
|
||||
_("Size"),
|
||||
"res/actions/scaleWidth24_black.png")
|
||||
.AddParameter("object", _("Object"))
|
||||
.AddParameter("behavior", _("Behavior"), "ScalableBehavior")
|
||||
@@ -69,6 +72,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
|
||||
gd::ParameterOptions::MakeNewOptions().SetDescription(
|
||||
_("Scale (1 by default)")))
|
||||
.MarkAsAdvanced();
|
||||
aut.GetAllExpressions()["X"].SetGroup("");
|
||||
|
||||
aut.AddExpressionAndConditionAndAction(
|
||||
"number",
|
||||
@@ -76,7 +80,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
|
||||
_("Scale on Y axis"),
|
||||
_("the scale on Y axis of the object (default scale is 1)"),
|
||||
_("the scale on Y axis"),
|
||||
_("Scale"),
|
||||
_("Size"),
|
||||
"res/actions/scaleHeight24_black.png")
|
||||
.AddParameter("object", _("Object"))
|
||||
.AddParameter("behavior", _("Behavior"), "ScalableBehavior")
|
||||
@@ -85,6 +89,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsScalableExtension(
|
||||
gd::ParameterOptions::MakeNewOptions().SetDescription(
|
||||
_("Scale (1 by default)")))
|
||||
.MarkAsAdvanced();
|
||||
aut.GetAllExpressions()["Y"].SetGroup("");
|
||||
}
|
||||
|
||||
} // namespace gd
|
||||
|
@@ -0,0 +1,58 @@
|
||||
/*
|
||||
* GDevelop Core
|
||||
* Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
|
||||
* reserved. This project is released under the GNU Lesser General Public
|
||||
* License.
|
||||
*/
|
||||
#include "GDCore/Extensions/Builtin/AllBuiltinExtensions.h"
|
||||
#include "GDCore/Extensions/Metadata/MultipleInstructionMetadata.h"
|
||||
#include "GDCore/Project/Behavior.h"
|
||||
#include "GDCore/Project/BehaviorsSharedData.h"
|
||||
#include "GDCore/Project/Object.h"
|
||||
#include "GDCore/Tools/Localization.h"
|
||||
|
||||
using namespace std;
|
||||
namespace gd {
|
||||
|
||||
void GD_CORE_API BuiltinExtensionsImplementer::ImplementsTextContainerExtension(
|
||||
gd::PlatformExtension& extension) {
|
||||
extension
|
||||
.SetExtensionInformation("TextContainerCapability",
|
||||
_("Text capability"),
|
||||
_("Animate objects."),
|
||||
"Florian Rival",
|
||||
"Open source (MIT License)")
|
||||
.SetExtensionHelpPath("/objects");
|
||||
extension.AddInstructionOrExpressionGroupMetadata(_("Text capability"))
|
||||
.SetIcon("res/conditions/text24_black.png");
|
||||
|
||||
gd::BehaviorMetadata& aut = extension.AddBehavior(
|
||||
"TextContainerBehavior",
|
||||
_("Text capability"),
|
||||
"Text",
|
||||
_("Access objects text."),
|
||||
"",
|
||||
"res/conditions/text24_black.png",
|
||||
"TextContainerBehavior",
|
||||
std::make_shared<gd::Behavior>(),
|
||||
std::make_shared<gd::BehaviorsSharedData>())
|
||||
.SetHidden();
|
||||
|
||||
aut.AddExpressionAndConditionAndAction(
|
||||
"string",
|
||||
"Value",
|
||||
_("Text"),
|
||||
_("the text"),
|
||||
_("the text"),
|
||||
"",
|
||||
"res/conditions/text24_black.png")
|
||||
.AddParameter("object", _("Object"))
|
||||
.AddParameter("behavior", _("Behavior"), "TextContainerBehavior")
|
||||
.UseStandardParameters(
|
||||
"string", gd::ParameterOptions::MakeNewOptions().SetDescription(
|
||||
_("Text")))
|
||||
.MarkAsSimple();
|
||||
aut.GetAllStrExpressions()["Value"].SetGroup("");
|
||||
}
|
||||
|
||||
} // namespace gd
|
@@ -30,7 +30,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
|
||||
.AddObject<SpriteObject>("Sprite",
|
||||
_("Sprite"),
|
||||
_("Animated object which can be used for "
|
||||
"most elements of a game"),
|
||||
"most elements of a game."),
|
||||
"CppPlatform/Extensions/spriteicon.png")
|
||||
.SetCategoryFullName(_("General"))
|
||||
.AddDefaultBehavior("EffectCapability::EffectBehavior")
|
||||
@@ -408,6 +408,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
|
||||
.SetHidden()
|
||||
.MarkAsSimple();
|
||||
|
||||
// Deprecated
|
||||
obj.AddCondition("ScaleWidth",
|
||||
_("Scale on X axis"),
|
||||
_("Compare the scale of the width of an object."),
|
||||
@@ -415,7 +416,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
|
||||
_("Size"),
|
||||
"res/conditions/scaleWidth24_black.png",
|
||||
"res/conditions/scaleWidth_black.png")
|
||||
|
||||
.SetHidden()
|
||||
.AddParameter("object", _("Object"), "Sprite")
|
||||
.UseStandardRelationalOperatorParameters(
|
||||
"number",
|
||||
@@ -423,6 +424,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
|
||||
_("Scale (1 by default)")))
|
||||
.MarkAsAdvanced();
|
||||
|
||||
// Deprecated
|
||||
obj.AddCondition("ScaleHeight",
|
||||
_("Scale on Y axis"),
|
||||
_("Compare the scale of the height of an object."),
|
||||
@@ -430,7 +432,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
|
||||
_("Size"),
|
||||
"res/conditions/scaleHeight24_black.png",
|
||||
"res/conditions/scaleHeight_black.png")
|
||||
|
||||
.SetHidden()
|
||||
.AddParameter("object", _("Object"), "Sprite")
|
||||
.UseStandardRelationalOperatorParameters(
|
||||
"number",
|
||||
|
@@ -303,12 +303,24 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* \brief Return true if the instruction must be hidden in the IDE.
|
||||
* \brief Return true if the object must be hidden in the IDE.
|
||||
*/
|
||||
bool IsHidden() const { return hidden; }
|
||||
|
||||
/**
|
||||
* \brief Declare a usage of the 3D renderer.
|
||||
*/
|
||||
ObjectMetadata &MarkAsRenderedIn3D() {
|
||||
isRenderedIn3D = true;
|
||||
return *this;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Return true if the object uses the 3D renderer.
|
||||
*/
|
||||
bool IsRenderedIn3D() const { return isRenderedIn3D; }
|
||||
|
||||
std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
|
||||
std::map<gd::String, gd::InstructionMetadata> actionsInfos;
|
||||
std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
|
||||
@@ -329,6 +341,7 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
|
||||
gd::String categoryFullName;
|
||||
std::set<gd::String> defaultBehaviorTypes;
|
||||
bool hidden = false;
|
||||
bool isRenderedIn3D = false;
|
||||
|
||||
std::shared_ptr<gd::ObjectConfiguration>
|
||||
blueprintObject; ///< The "blueprint" object to be copied when a new
|
||||
|
@@ -25,6 +25,9 @@ const UsedExtensionsResult UsedExtensionsFinder::ScanProject(gd::Project& projec
|
||||
void UsedExtensionsFinder::DoVisitObject(gd::Object &object) {
|
||||
auto metadata = gd::MetadataProvider::GetExtensionAndObjectMetadata(
|
||||
project.GetCurrentPlatform(), object.GetType());
|
||||
if (metadata.GetMetadata().IsRenderedIn3D()) {
|
||||
result.MarkAsHaving3DObjects();
|
||||
}
|
||||
result.GetUsedExtensions().insert(metadata.GetExtension().GetName());
|
||||
for (auto &&includeFile : metadata.GetMetadata().includeFiles) {
|
||||
result.GetUsedIncludeFiles().insert(includeFile);
|
||||
|
@@ -44,6 +44,13 @@ public:
|
||||
return usedRequiredFiles;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Return true when at least 1 object uses the 3D renderer.
|
||||
*/
|
||||
bool Has3DObjects() const {
|
||||
return has3DObjects;
|
||||
}
|
||||
|
||||
/**
|
||||
* The extensions used by the project (or part of it).
|
||||
*/
|
||||
@@ -59,10 +66,15 @@ public:
|
||||
*/
|
||||
std::set<gd::String> &GetUsedRequiredFiles() { return usedRequiredFiles; }
|
||||
|
||||
void MarkAsHaving3DObjects() {
|
||||
has3DObjects = true;
|
||||
}
|
||||
|
||||
private:
|
||||
std::set<gd::String> usedExtensions;
|
||||
std::set<gd::String> usedIncludeFiles;
|
||||
std::set<gd::String> usedRequiredFiles;
|
||||
bool has3DObjects = false;
|
||||
};
|
||||
|
||||
class GD_CORE_API UsedExtensionsFinder
|
||||
|
@@ -293,8 +293,8 @@ void ResourceWorkerInObjectsWorker::DoVisitBehavior(gd::Behavior &behavior){
|
||||
gd::ResourceWorkerInObjectsWorker
|
||||
GetResourceWorkerOnObjects(const gd::Project &project,
|
||||
gd::ArbitraryResourceWorker &worker) {
|
||||
gd::ResourceWorkerInObjectsWorker eventsWorker(project, worker);
|
||||
return eventsWorker;
|
||||
gd::ResourceWorkerInObjectsWorker resourcesWorker(project, worker);
|
||||
return resourcesWorker;
|
||||
}
|
||||
|
||||
} // namespace gd
|
||||
|
19
Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.cpp
Normal file
19
Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.cpp
Normal file
@@ -0,0 +1,19 @@
|
||||
#include "ObjectsUsingResourceCollector.h"
|
||||
|
||||
#include "GDCore/Project/Object.h"
|
||||
#include "GDCore/Project/Project.h"
|
||||
|
||||
namespace gd {
|
||||
|
||||
void ObjectsUsingResourceCollector::DoVisitObject(gd::Object& object) {
|
||||
gd::ResourceNameMatcher resourceNameMatcher(resourceName);
|
||||
|
||||
object.GetConfiguration().ExposeResources(resourceNameMatcher);
|
||||
if (resourceNameMatcher.AnyResourceMatches()) {
|
||||
objectNames.push_back(object.GetName());
|
||||
}
|
||||
};
|
||||
|
||||
ObjectsUsingResourceCollector::~ObjectsUsingResourceCollector() {}
|
||||
|
||||
} // namespace gd
|
89
Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h
Normal file
89
Core/GDCore/IDE/Project/ObjectsUsingResourceCollector.h
Normal file
@@ -0,0 +1,89 @@
|
||||
/*
|
||||
* GDevelop Core
|
||||
* Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
|
||||
* reserved. This project is released under the MIT License.
|
||||
*/
|
||||
|
||||
#ifndef ProjectObjectsUsingResourceCollector_H
|
||||
#define ProjectObjectsUsingResourceCollector_H
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
|
||||
#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
|
||||
#include "GDCore/String.h"
|
||||
|
||||
namespace gd {
|
||||
class Object;
|
||||
} // namespace gd
|
||||
|
||||
namespace gd {
|
||||
|
||||
class GD_CORE_API ObjectsUsingResourceCollector
|
||||
: public ArbitraryObjectsWorker {
|
||||
public:
|
||||
ObjectsUsingResourceCollector(const gd::String& resourceName_)
|
||||
: resourceName(resourceName_){};
|
||||
virtual ~ObjectsUsingResourceCollector();
|
||||
|
||||
std::vector<gd::String>& GetObjectNames() { return objectNames; }
|
||||
|
||||
private:
|
||||
void DoVisitObject(gd::Object& object) override;
|
||||
|
||||
std::vector<gd::String> objectNames;
|
||||
gd::String resourceName;
|
||||
};
|
||||
|
||||
class GD_CORE_API ResourceNameMatcher : public ArbitraryResourceWorker {
|
||||
public:
|
||||
ResourceNameMatcher(const gd::String& resourceName_)
|
||||
: resourceName(resourceName_), matchesResourceName(false){};
|
||||
virtual ~ResourceNameMatcher(){};
|
||||
|
||||
bool AnyResourceMatches() { return matchesResourceName; }
|
||||
void Reset() { matchesResourceName = false; }
|
||||
|
||||
private:
|
||||
virtual void ExposeFile(gd::String& resource) override{
|
||||
/*Don't care, we just read resource names*/
|
||||
};
|
||||
virtual void ExposeImage(gd::String& otherResourceName) override {
|
||||
MatchResourceName(otherResourceName);
|
||||
};
|
||||
virtual void ExposeAudio(gd::String& otherResourceName) override {
|
||||
MatchResourceName(otherResourceName);
|
||||
};
|
||||
virtual void ExposeFont(gd::String& otherResourceName) override {
|
||||
MatchResourceName(otherResourceName);
|
||||
};
|
||||
virtual void ExposeJson(gd::String& otherResourceName) override {
|
||||
MatchResourceName(otherResourceName);
|
||||
};
|
||||
virtual void ExposeTilemap(gd::String& otherResourceName) override {
|
||||
MatchResourceName(otherResourceName);
|
||||
};
|
||||
virtual void ExposeTileset(gd::String& otherResourceName) override {
|
||||
MatchResourceName(otherResourceName);
|
||||
};
|
||||
virtual void ExposeVideo(gd::String& otherResourceName) override {
|
||||
MatchResourceName(otherResourceName);
|
||||
};
|
||||
virtual void ExposeBitmapFont(gd::String& otherResourceName) override {
|
||||
MatchResourceName(otherResourceName);
|
||||
};
|
||||
virtual void ExposeModel3D(gd::String& otherResourceName) override {
|
||||
MatchResourceName(otherResourceName);
|
||||
};
|
||||
|
||||
void MatchResourceName(gd::String& otherResourceName) {
|
||||
if (otherResourceName == resourceName) matchesResourceName = true;
|
||||
}
|
||||
|
||||
gd::String resourceName;
|
||||
bool matchesResourceName;
|
||||
};
|
||||
|
||||
}; // namespace gd
|
||||
|
||||
#endif // ProjectObjectsUsingResourceCollector_H
|
@@ -140,7 +140,7 @@ void ProjectBrowserHelper::ExposeProjectEvents(
|
||||
globalObjectsAndGroups, objectsAndGroups);
|
||||
auto projectScopedContainers =
|
||||
gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsAndGroups, objectsAndGroups);
|
||||
projectScopedContainers.AddParameters(eventsFunction->GetParameters());
|
||||
projectScopedContainers.AddParameters(eventsFunction->GetParametersForEvents(eventsFunctionsExtension));
|
||||
|
||||
worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
|
||||
}
|
||||
@@ -183,7 +183,7 @@ void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
|
||||
gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsAndGroups, objectsAndGroups);
|
||||
projectScopedContainers.AddPropertiesContainer(eventsBasedBehavior.GetSharedPropertyDescriptors());
|
||||
projectScopedContainers.AddPropertiesContainer(eventsBasedBehavior.GetPropertyDescriptors());
|
||||
projectScopedContainers.AddParameters(eventsFunction->GetParameters());
|
||||
projectScopedContainers.AddParameters(eventsFunction->GetParametersForEvents(eventsBasedBehavior.GetEventsFunctions()));
|
||||
|
||||
worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
|
||||
}
|
||||
@@ -202,7 +202,7 @@ void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
|
||||
auto projectScopedContainers =
|
||||
gd::ProjectScopedContainers::MakeNewProjectScopedContainersFor(globalObjectsAndGroups, objectsAndGroups);
|
||||
projectScopedContainers.AddPropertiesContainer(eventsBasedObject.GetPropertyDescriptors());
|
||||
projectScopedContainers.AddParameters(eventsFunction->GetParameters());
|
||||
projectScopedContainers.AddParameters(eventsFunction->GetParametersForEvents(eventsBasedObject.GetEventsFunctions()));
|
||||
|
||||
worker.Launch(eventsFunction->GetEvents(), projectScopedContainers);
|
||||
}
|
||||
|
@@ -17,7 +17,7 @@ EventsBasedObject::EventsBasedObject()
|
||||
}
|
||||
|
||||
EventsBasedObject::~EventsBasedObject() {}
|
||||
|
||||
|
||||
EventsBasedObject::EventsBasedObject(const gd::EventsBasedObject &_eventBasedObject)
|
||||
: AbstractEventsBasedEntity(_eventBasedObject) {
|
||||
// TODO Add a copy constructor in ObjectsContainer.
|
||||
@@ -27,17 +27,26 @@ EventsBasedObject::EventsBasedObject(const gd::EventsBasedObject &_eventBasedObj
|
||||
|
||||
void EventsBasedObject::SerializeTo(SerializerElement& element) const {
|
||||
element.SetAttribute("defaultName", defaultName);
|
||||
if (isRenderedIn3D) {
|
||||
element.SetBoolAttribute("is3D", true);
|
||||
}
|
||||
|
||||
AbstractEventsBasedEntity::SerializeTo(element);
|
||||
SerializeObjectsTo(element.AddChild("objects"));
|
||||
SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
|
||||
}
|
||||
|
||||
void EventsBasedObject::UnserializeFrom(gd::Project& project,
|
||||
const SerializerElement& element) {
|
||||
const SerializerElement& element) {
|
||||
defaultName = element.GetStringAttribute("defaultName");
|
||||
isRenderedIn3D = element.GetBoolAttribute("is3D", false);
|
||||
|
||||
AbstractEventsBasedEntity::UnserializeFrom(project, element);
|
||||
UnserializeObjectsFrom(project, element.GetChild("objects"));
|
||||
if (element.HasChild("objectsFolderStructure")) {
|
||||
UnserializeFoldersFrom(project, element.GetChild("objectsFolderStructure", 0));
|
||||
}
|
||||
AddMissingObjectsInRootFolder();
|
||||
}
|
||||
|
||||
} // namespace gd
|
||||
|
@@ -72,6 +72,19 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
|
||||
return *this;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Declare a usage of the 3D renderer.
|
||||
*/
|
||||
EventsBasedObject& MarkAsRenderedIn3D(bool isRenderedIn3D_) {
|
||||
isRenderedIn3D = isRenderedIn3D_;
|
||||
return *this;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Return true if the object uses the 3D renderer.
|
||||
*/
|
||||
bool IsRenderedIn3D() const { return isRenderedIn3D; }
|
||||
|
||||
void SerializeTo(SerializerElement& element) const override;
|
||||
|
||||
void UnserializeFrom(gd::Project& project,
|
||||
@@ -79,6 +92,7 @@ class GD_CORE_API EventsBasedObject: public AbstractEventsBasedEntity, public Ob
|
||||
|
||||
private:
|
||||
gd::String defaultName;
|
||||
bool isRenderedIn3D;
|
||||
};
|
||||
|
||||
} // namespace gd
|
||||
|
@@ -19,7 +19,7 @@ Layer::Layer()
|
||||
isLocked(false),
|
||||
isLightingLayer(false),
|
||||
followBaseLayerCamera(false),
|
||||
camera3DNearPlaneDistance(0.1),
|
||||
camera3DNearPlaneDistance(3),
|
||||
camera3DFarPlaneDistance(10000),
|
||||
camera3DFieldOfView(45),
|
||||
ambientLightColorR(200),
|
||||
|
@@ -294,6 +294,7 @@ void Layout::SerializeTo(SerializerElement& element) const {
|
||||
GetVariables().SerializeTo(element.AddChild("variables"));
|
||||
GetInitialInstances().SerializeTo(element.AddChild("instances"));
|
||||
SerializeObjectsTo(element.AddChild("objects"));
|
||||
SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
|
||||
gd::EventsListSerialization::SerializeEventsTo(events,
|
||||
element.AddChild("events"));
|
||||
|
||||
@@ -353,6 +354,11 @@ void Layout::UnserializeFrom(gd::Project& project,
|
||||
project, GetEvents(), element.GetChild("events", 0, "Events"));
|
||||
|
||||
UnserializeObjectsFrom(project, element.GetChild("objects", 0, "Objets"));
|
||||
if (element.HasChild("objectsFolderStructure")) {
|
||||
UnserializeFoldersFrom(project, element.GetChild("objectsFolderStructure", 0));
|
||||
}
|
||||
AddMissingObjectsInRootFolder();
|
||||
|
||||
initialInstances.UnserializeFrom(
|
||||
element.GetChild("instances", 0, "Positions"));
|
||||
variables.UnserializeFrom(element.GetChild("variables", 0, "Variables"));
|
||||
|
@@ -40,7 +40,6 @@ void Object::Init(const gd::Object& object) {
|
||||
name = object.name;
|
||||
assetStoreId = object.assetStoreId;
|
||||
objectVariables = object.objectVariables;
|
||||
tags = object.tags;
|
||||
effectsContainer = object.effectsContainer;
|
||||
|
||||
behaviors.clear();
|
||||
@@ -134,7 +133,6 @@ void Object::UnserializeFrom(gd::Project& project,
|
||||
SetType(element.GetStringAttribute("type"));
|
||||
assetStoreId = element.GetStringAttribute("assetStoreId");
|
||||
name = element.GetStringAttribute("name", name, "nom");
|
||||
tags = element.GetStringAttribute("tags");
|
||||
|
||||
objectVariables.UnserializeFrom(
|
||||
element.GetChild("variables", 0, "Variables"));
|
||||
@@ -207,7 +205,6 @@ void Object::SerializeTo(SerializerElement& element) const {
|
||||
element.SetAttribute("name", GetName());
|
||||
element.SetAttribute("assetStoreId", GetAssetStoreId());
|
||||
element.SetAttribute("type", GetType());
|
||||
element.SetAttribute("tags", GetTags());
|
||||
objectVariables.SerializeTo(element.AddChild("variables"));
|
||||
effectsContainer.SerializeTo(element.AddChild("effects"));
|
||||
|
||||
|
@@ -120,14 +120,6 @@ class GD_CORE_API Object {
|
||||
*/
|
||||
const gd::String& GetType() const { return configuration->GetType(); }
|
||||
|
||||
/** \brief Change the tags of the object.
|
||||
*/
|
||||
void SetTags(const gd::String& tags_) { tags = tags_; }
|
||||
|
||||
/** \brief Return the tags of the object.
|
||||
*/
|
||||
const gd::String& GetTags() const { return tags; }
|
||||
|
||||
/** \brief Shortcut to check if the object is a 3D object.
|
||||
*/
|
||||
bool Is3DObject() const { return configuration->Is3DObject(); }
|
||||
@@ -268,7 +260,6 @@ class GD_CORE_API Object {
|
||||
///< object.
|
||||
gd::VariablesContainer
|
||||
objectVariables; ///< List of the variables of the object
|
||||
gd::String tags; ///< Comma-separated list of tags
|
||||
gd::EffectsContainer
|
||||
effectsContainer; ///< The effects container for the object.
|
||||
mutable gd::String persistentUuid; ///< A persistent random version 4 UUID,
|
||||
|
248
Core/GDCore/Project/ObjectFolderOrObject.cpp
Normal file
248
Core/GDCore/Project/ObjectFolderOrObject.cpp
Normal file
@@ -0,0 +1,248 @@
|
||||
/*
|
||||
* GDevelop Core
|
||||
* Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
|
||||
* reserved. This project is released under the MIT License.
|
||||
*/
|
||||
#include "GDCore/Project/ObjectFolderOrObject.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "GDCore/Project/Object.h"
|
||||
#include "GDCore/Project/ObjectsContainer.h"
|
||||
#include "GDCore/Serialization/SerializerElement.h"
|
||||
#include "GDCore/Tools/Log.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace gd {
|
||||
|
||||
ObjectFolderOrObject ObjectFolderOrObject::badObjectFolderOrObject;
|
||||
|
||||
ObjectFolderOrObject::ObjectFolderOrObject()
|
||||
: folderName("__NULL"), object(nullptr) {}
|
||||
ObjectFolderOrObject::ObjectFolderOrObject(gd::String folderName_,
|
||||
ObjectFolderOrObject* parent_)
|
||||
: folderName(folderName_), parent(parent_), object(nullptr) {}
|
||||
ObjectFolderOrObject::ObjectFolderOrObject(gd::Object* object_,
|
||||
ObjectFolderOrObject* parent_)
|
||||
: object(object_), parent(parent_) {}
|
||||
ObjectFolderOrObject::~ObjectFolderOrObject() {}
|
||||
|
||||
bool ObjectFolderOrObject::HasObjectNamed(const gd::String& name) {
|
||||
if (IsFolder()) {
|
||||
return std::any_of(
|
||||
children.begin(),
|
||||
children.end(),
|
||||
[&name](
|
||||
std::unique_ptr<gd::ObjectFolderOrObject>& objectFolderOrObject) {
|
||||
return objectFolderOrObject->HasObjectNamed(name);
|
||||
});
|
||||
}
|
||||
if (!object) return false;
|
||||
return object->GetName() == name;
|
||||
}
|
||||
ObjectFolderOrObject& ObjectFolderOrObject::GetObjectNamed(
|
||||
const gd::String& name) {
|
||||
if (object && object->GetName() == name) {
|
||||
return *this;
|
||||
}
|
||||
if (IsFolder()) {
|
||||
for (std::size_t j = 0; j < children.size(); j++) {
|
||||
ObjectFolderOrObject& foundInChild = children[j]->GetObjectNamed(name);
|
||||
if (&(foundInChild) != &badObjectFolderOrObject) {
|
||||
return foundInChild;
|
||||
}
|
||||
}
|
||||
}
|
||||
return badObjectFolderOrObject;
|
||||
}
|
||||
|
||||
void ObjectFolderOrObject::SetFolderName(const gd::String& name) {
|
||||
if (!IsFolder()) return;
|
||||
folderName = name;
|
||||
}
|
||||
|
||||
ObjectFolderOrObject& ObjectFolderOrObject::GetChildAt(std::size_t index) {
|
||||
if (index >= children.size()) return badObjectFolderOrObject;
|
||||
return *children[index];
|
||||
}
|
||||
const ObjectFolderOrObject& ObjectFolderOrObject::GetChildAt(std::size_t index) const {
|
||||
if (index >= children.size()) return badObjectFolderOrObject;
|
||||
return *children[index];
|
||||
}
|
||||
ObjectFolderOrObject& ObjectFolderOrObject::GetObjectChild(
|
||||
const gd::String& name) {
|
||||
for (std::size_t j = 0; j < children.size(); j++) {
|
||||
if (!children[j]->IsFolder()) {
|
||||
if (children[j]->GetObject().GetName() == name) return *children[j];
|
||||
};
|
||||
}
|
||||
return badObjectFolderOrObject;
|
||||
}
|
||||
|
||||
void ObjectFolderOrObject::InsertObject(gd::Object* insertedObject,
|
||||
std::size_t position) {
|
||||
auto objectFolderOrObject =
|
||||
gd::make_unique<ObjectFolderOrObject>(insertedObject, this);
|
||||
if (position < children.size()) {
|
||||
children.insert(children.begin() + position,
|
||||
std::move(objectFolderOrObject));
|
||||
} else {
|
||||
children.push_back(std::move(objectFolderOrObject));
|
||||
}
|
||||
}
|
||||
|
||||
std::size_t ObjectFolderOrObject::GetChildPosition(
|
||||
const ObjectFolderOrObject& child) const {
|
||||
for (std::size_t j = 0; j < children.size(); j++) {
|
||||
if (children[j].get() == &child) return j;
|
||||
}
|
||||
return gd::String::npos;
|
||||
}
|
||||
|
||||
ObjectFolderOrObject& ObjectFolderOrObject::InsertNewFolder(
|
||||
const gd::String& newFolderName, std::size_t position) {
|
||||
auto newFolderPtr =
|
||||
gd::make_unique<ObjectFolderOrObject>(newFolderName, this);
|
||||
gd::ObjectFolderOrObject& newFolder = *(*(children.insert(
|
||||
position < children.size() ? children.begin() + position : children.end(),
|
||||
std::move(newFolderPtr))));
|
||||
return newFolder;
|
||||
};
|
||||
|
||||
void ObjectFolderOrObject::RemoveRecursivelyObjectNamed(
|
||||
const gd::String& name) {
|
||||
if (IsFolder()) {
|
||||
children.erase(
|
||||
std::remove_if(children.begin(),
|
||||
children.end(),
|
||||
[&name](std::unique_ptr<gd::ObjectFolderOrObject>&
|
||||
objectFolderOrObject) {
|
||||
return !objectFolderOrObject->IsFolder() &&
|
||||
objectFolderOrObject->GetObject().GetName() ==
|
||||
name;
|
||||
}),
|
||||
children.end());
|
||||
for (auto& it : children) {
|
||||
it->RemoveRecursivelyObjectNamed(name);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
bool ObjectFolderOrObject::IsADescendantOf(
|
||||
const ObjectFolderOrObject& otherObjectFolderOrObject) {
|
||||
if (parent == nullptr) return false;
|
||||
if (&(*parent) == &otherObjectFolderOrObject) return true;
|
||||
return parent->IsADescendantOf(otherObjectFolderOrObject);
|
||||
}
|
||||
|
||||
void ObjectFolderOrObject::MoveChild(std::size_t oldIndex,
|
||||
std::size_t newIndex) {
|
||||
if (!IsFolder()) return;
|
||||
if (oldIndex >= children.size() || newIndex >= children.size()) return;
|
||||
|
||||
std::unique_ptr<gd::ObjectFolderOrObject> objectFolderOrObject =
|
||||
std::move(children[oldIndex]);
|
||||
children.erase(children.begin() + oldIndex);
|
||||
children.insert(children.begin() + newIndex, std::move(objectFolderOrObject));
|
||||
}
|
||||
|
||||
void ObjectFolderOrObject::RemoveFolderChild(
|
||||
const ObjectFolderOrObject& childToRemove) {
|
||||
if (!IsFolder() || !childToRemove.IsFolder() ||
|
||||
childToRemove.GetChildrenCount() > 0) {
|
||||
return;
|
||||
}
|
||||
std::vector<std::unique_ptr<gd::ObjectFolderOrObject>>::iterator it = find_if(
|
||||
children.begin(),
|
||||
children.end(),
|
||||
[&childToRemove](std::unique_ptr<gd::ObjectFolderOrObject>& child) {
|
||||
return child.get() == &childToRemove;
|
||||
});
|
||||
if (it == children.end()) return;
|
||||
|
||||
children.erase(it);
|
||||
}
|
||||
|
||||
void ObjectFolderOrObject::MoveObjectFolderOrObjectToAnotherFolder(
|
||||
gd::ObjectFolderOrObject& objectFolderOrObject,
|
||||
gd::ObjectFolderOrObject& newParentFolder,
|
||||
std::size_t newPosition) {
|
||||
if (!newParentFolder.IsFolder()) return;
|
||||
if (newParentFolder.IsADescendantOf(objectFolderOrObject)) return;
|
||||
|
||||
std::vector<std::unique_ptr<gd::ObjectFolderOrObject>>::iterator it =
|
||||
find_if(children.begin(),
|
||||
children.end(),
|
||||
[&objectFolderOrObject](std::unique_ptr<gd::ObjectFolderOrObject>&
|
||||
childObjectFolderOrObject) {
|
||||
return childObjectFolderOrObject.get() == &objectFolderOrObject;
|
||||
});
|
||||
if (it == children.end()) return;
|
||||
|
||||
std::unique_ptr<gd::ObjectFolderOrObject> objectFolderOrObjectPtr =
|
||||
std::move(*it);
|
||||
children.erase(it);
|
||||
|
||||
objectFolderOrObjectPtr->parent = &newParentFolder;
|
||||
newParentFolder.children.insert(
|
||||
newPosition < newParentFolder.children.size()
|
||||
? newParentFolder.children.begin() + newPosition
|
||||
: newParentFolder.children.end(),
|
||||
std::move(objectFolderOrObjectPtr));
|
||||
}
|
||||
|
||||
void ObjectFolderOrObject::SerializeTo(SerializerElement& element) const {
|
||||
if (IsFolder()) {
|
||||
element.SetAttribute("folderName", GetFolderName());
|
||||
if (children.size() > 0) {
|
||||
SerializerElement& childrenElement = element.AddChild("children");
|
||||
childrenElement.ConsiderAsArrayOf("objectFolderOrObject");
|
||||
for (std::size_t j = 0; j < children.size(); j++) {
|
||||
children[j]->SerializeTo(
|
||||
childrenElement.AddChild("objectFolderOrObject"));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
element.SetAttribute("objectName", GetObject().GetName());
|
||||
}
|
||||
}
|
||||
|
||||
void ObjectFolderOrObject::UnserializeFrom(
|
||||
gd::Project& project,
|
||||
const SerializerElement& element,
|
||||
gd::ObjectsContainer& objectsContainer) {
|
||||
children.clear();
|
||||
gd::String potentialFolderName = element.GetStringAttribute("folderName", "");
|
||||
|
||||
if (!potentialFolderName.empty()) {
|
||||
object = nullptr;
|
||||
folderName = potentialFolderName;
|
||||
|
||||
if (element.HasChild("children")) {
|
||||
const SerializerElement& childrenElements =
|
||||
element.GetChild("children", 0);
|
||||
childrenElements.ConsiderAsArrayOf("objectFolderOrObject");
|
||||
for (std::size_t i = 0; i < childrenElements.GetChildrenCount(); ++i) {
|
||||
std::unique_ptr<ObjectFolderOrObject> childObjectFolderOrObject =
|
||||
make_unique<ObjectFolderOrObject>();
|
||||
childObjectFolderOrObject->UnserializeFrom(
|
||||
project, childrenElements.GetChild(i), objectsContainer);
|
||||
childObjectFolderOrObject->parent = this;
|
||||
children.push_back(std::move(childObjectFolderOrObject));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
folderName = "";
|
||||
gd::String objectName = element.GetStringAttribute("objectName");
|
||||
if (objectsContainer.HasObjectNamed(objectName)) {
|
||||
object = &objectsContainer.GetObject(objectName);
|
||||
} else {
|
||||
gd::LogError("Object with name " + objectName +
|
||||
" not found in objects container.");
|
||||
object = nullptr;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace gd
|
203
Core/GDCore/Project/ObjectFolderOrObject.h
Normal file
203
Core/GDCore/Project/ObjectFolderOrObject.h
Normal file
@@ -0,0 +1,203 @@
|
||||
/*
|
||||
* GDevelop Core
|
||||
* Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
|
||||
* reserved. This project is released under the MIT License.
|
||||
*/
|
||||
#ifndef GDCORE_OBJECTFOLDEROROBJECT_H
|
||||
#define GDCORE_OBJECTFOLDEROROBJECT_H
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "GDCore/Serialization/SerializerElement.h"
|
||||
#include "GDCore/String.h"
|
||||
|
||||
namespace gd {
|
||||
class Project;
|
||||
class Object;
|
||||
class SerializerElement;
|
||||
class ObjectsContainer;
|
||||
} // namespace gd
|
||||
|
||||
namespace gd {
|
||||
|
||||
/**
|
||||
* \brief Class representing a folder structure in order to organize objects
|
||||
* in folders (to be used with an ObjectsContainer.)
|
||||
*
|
||||
* \see gd::ObjectsContainer
|
||||
*/
|
||||
class GD_CORE_API ObjectFolderOrObject {
|
||||
public:
|
||||
/**
|
||||
* \brief Default constructor creating an empty instance. Useful for the null
|
||||
* object pattern.
|
||||
*/
|
||||
ObjectFolderOrObject();
|
||||
virtual ~ObjectFolderOrObject();
|
||||
/**
|
||||
* \brief Constructor for creating an instance representing a folder.
|
||||
*/
|
||||
ObjectFolderOrObject(gd::String folderName_,
|
||||
ObjectFolderOrObject* parent_ = nullptr);
|
||||
/**
|
||||
* \brief Constructor for creating an instance representing an object.
|
||||
*/
|
||||
ObjectFolderOrObject(gd::Object* object_,
|
||||
ObjectFolderOrObject* parent_ = nullptr);
|
||||
|
||||
/**
|
||||
* \brief Returns the object behind the instance.
|
||||
*/
|
||||
gd::Object& GetObject() const { return *object; }
|
||||
|
||||
/**
|
||||
* \brief Returns true if the instance represents a folder.
|
||||
*/
|
||||
bool IsFolder() const { return !folderName.empty(); }
|
||||
/**
|
||||
* \brief Returns the name of the folder.
|
||||
*/
|
||||
const gd::String& GetFolderName() const { return folderName; }
|
||||
|
||||
/**
|
||||
* \brief Set the folder name. Does nothing if called on an instance not
|
||||
* representing a folder.
|
||||
*/
|
||||
void SetFolderName(const gd::String& name);
|
||||
|
||||
/**
|
||||
* \brief Returns true if the instance represents the object with the given
|
||||
* name or if any of the children does (recursive search).
|
||||
*/
|
||||
bool HasObjectNamed(const gd::String& name);
|
||||
/**
|
||||
* \brief Returns the child instance holding the object with the given name
|
||||
* (recursive search).
|
||||
*/
|
||||
ObjectFolderOrObject& GetObjectNamed(const gd::String& name);
|
||||
|
||||
/**
|
||||
* \brief Returns the number of children. Returns 0 if the instance represents
|
||||
* an object.
|
||||
*/
|
||||
std::size_t GetChildrenCount() const {
|
||||
if (IsFolder()) return children.size();
|
||||
return 0;
|
||||
}
|
||||
/**
|
||||
* \brief Returns the child ObjectFolderOrObject at the given index.
|
||||
*/
|
||||
ObjectFolderOrObject& GetChildAt(std::size_t index);
|
||||
/**
|
||||
* \brief Returns the child ObjectFolderOrObject at the given index.
|
||||
*/
|
||||
const ObjectFolderOrObject& GetChildAt(std::size_t index) const;
|
||||
/**
|
||||
* \brief Returns the child ObjectFolderOrObject that represents the object
|
||||
* with the given name. To use only if sure that the instance holds the object
|
||||
* in its direct children (no recursive search).
|
||||
*
|
||||
* \note The equivalent method to get a folder by its name cannot be
|
||||
* implemented because there is no unicity enforced on the folder name.
|
||||
*/
|
||||
ObjectFolderOrObject& GetObjectChild(const gd::String& name);
|
||||
|
||||
/**
|
||||
* \brief Returns the parent of the instance. If the instance has no parent
|
||||
* (root folder), the null object is returned.
|
||||
*/
|
||||
ObjectFolderOrObject& GetParent() {
|
||||
if (parent == nullptr) {
|
||||
return badObjectFolderOrObject;
|
||||
}
|
||||
return *parent;
|
||||
};
|
||||
|
||||
/**
|
||||
* \brief Returns true if the instance is a root folder (that's to say it
|
||||
* has no parent).
|
||||
*/
|
||||
bool IsRootFolder() { return !object && !parent; }
|
||||
|
||||
/**
|
||||
* \brief Moves a child from a position to a new one.
|
||||
*/
|
||||
void MoveChild(std::size_t oldIndex, std::size_t newIndex);
|
||||
/**
|
||||
* \brief Removes the given child from the instance's children. If the given
|
||||
* child contains children of its own, does nothing.
|
||||
*/
|
||||
void RemoveFolderChild(const ObjectFolderOrObject& childToRemove);
|
||||
/**
|
||||
* \brief Removes the child representing the object with the given name from
|
||||
* the instance children and recursively does it for every folder children.
|
||||
*/
|
||||
void RemoveRecursivelyObjectNamed(const gd::String& name);
|
||||
|
||||
/**
|
||||
* \brief Inserts an instance representing the given object at the given
|
||||
* position.
|
||||
*/
|
||||
void InsertObject(gd::Object* insertedObject,
|
||||
std::size_t position = (size_t)-1);
|
||||
/**
|
||||
* \brief Inserts an instance representing a folder with the given name at the
|
||||
* given position.
|
||||
*/
|
||||
ObjectFolderOrObject& InsertNewFolder(const gd::String& newFolderName,
|
||||
std::size_t position);
|
||||
/**
|
||||
* \brief Returns true if the instance is a descendant of the given instance
|
||||
* of ObjectFolderOrObject.
|
||||
*/
|
||||
bool IsADescendantOf(const ObjectFolderOrObject& otherObjectFolderOrObject);
|
||||
|
||||
/**
|
||||
* \brief Returns the position of the given instance of ObjectFolderOrObject
|
||||
* in the instance's children.
|
||||
*/
|
||||
std::size_t GetChildPosition(const ObjectFolderOrObject& child) const;
|
||||
/**
|
||||
* \brief Moves the given child ObjectFolderOrObject to the given folder at
|
||||
* the given position.
|
||||
*/
|
||||
void MoveObjectFolderOrObjectToAnotherFolder(
|
||||
gd::ObjectFolderOrObject& objectFolderOrObject,
|
||||
gd::ObjectFolderOrObject& newParentFolder,
|
||||
std::size_t newPosition);
|
||||
|
||||
/** \name Saving and loading
|
||||
* Members functions related to saving and loading the objects of the class.
|
||||
*/
|
||||
///@{
|
||||
/**
|
||||
* \brief Serialize the ObjectFolderOrObject instance.
|
||||
*/
|
||||
void SerializeTo(SerializerElement& element) const;
|
||||
|
||||
/**
|
||||
* \brief Unserialize the ObjectFolderOrObject instance.
|
||||
*/
|
||||
void UnserializeFrom(gd::Project& project,
|
||||
const SerializerElement& element,
|
||||
ObjectsContainer& objectsContainer);
|
||||
///@}
|
||||
|
||||
private:
|
||||
static gd::ObjectFolderOrObject badObjectFolderOrObject;
|
||||
|
||||
gd::ObjectFolderOrObject*
|
||||
parent; // nullptr if root folder, points to the parent folder otherwise.
|
||||
|
||||
// Representing an object:
|
||||
gd::Object* object; // nullptr if folderName is set.
|
||||
|
||||
// or representing a folder:
|
||||
gd::String folderName; // Empty if object is set.
|
||||
std::vector<std::unique_ptr<ObjectFolderOrObject>>
|
||||
children; // Folder children.
|
||||
};
|
||||
|
||||
} // namespace gd
|
||||
|
||||
#endif // GDCORE_OBJECTFOLDEROROBJECT_H
|
@@ -9,12 +9,15 @@
|
||||
|
||||
#include "GDCore/Extensions/Platform.h"
|
||||
#include "GDCore/Project/Object.h"
|
||||
#include "GDCore/Project/ObjectFolderOrObject.h"
|
||||
#include "GDCore/Project/Project.h"
|
||||
#include "GDCore/Serialization/SerializerElement.h"
|
||||
|
||||
namespace gd {
|
||||
|
||||
ObjectsContainer::ObjectsContainer() {}
|
||||
ObjectsContainer::ObjectsContainer() {
|
||||
rootFolder = gd::make_unique<gd::ObjectFolderOrObject>("__ROOT");
|
||||
}
|
||||
|
||||
ObjectsContainer::~ObjectsContainer() {}
|
||||
|
||||
@@ -24,6 +27,22 @@ void ObjectsContainer::SerializeObjectsTo(SerializerElement& element) const {
|
||||
initialObjects[j]->SerializeTo(element.AddChild("object"));
|
||||
}
|
||||
}
|
||||
void ObjectsContainer::SerializeFoldersTo(SerializerElement& element) const {
|
||||
rootFolder->SerializeTo(element);
|
||||
}
|
||||
|
||||
void ObjectsContainer::UnserializeFoldersFrom(
|
||||
gd::Project& project, const SerializerElement& element) {
|
||||
rootFolder->UnserializeFrom(project, element, *this);
|
||||
}
|
||||
|
||||
void ObjectsContainer::AddMissingObjectsInRootFolder() {
|
||||
for (std::size_t i = 0; i < initialObjects.size(); ++i) {
|
||||
if (!rootFolder->HasObjectNamed(initialObjects[i]->GetName())) {
|
||||
rootFolder->InsertObject(&(*initialObjects[i]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ObjectsContainer::UnserializeObjectsFrom(
|
||||
gd::Project& project, const SerializerElement& element) {
|
||||
@@ -48,17 +67,23 @@ void ObjectsContainer::UnserializeObjectsFrom(
|
||||
bool ObjectsContainer::HasObjectNamed(const gd::String& name) const {
|
||||
return (find_if(initialObjects.begin(),
|
||||
initialObjects.end(),
|
||||
[&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; }) != initialObjects.end());
|
||||
[&](const std::unique_ptr<gd::Object>& object) {
|
||||
return object->GetName() == name;
|
||||
}) != initialObjects.end());
|
||||
}
|
||||
gd::Object& ObjectsContainer::GetObject(const gd::String& name) {
|
||||
return *(*find_if(initialObjects.begin(),
|
||||
initialObjects.end(),
|
||||
[&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; }));
|
||||
[&](const std::unique_ptr<gd::Object>& object) {
|
||||
return object->GetName() == name;
|
||||
}));
|
||||
}
|
||||
const gd::Object& ObjectsContainer::GetObject(const gd::String& name) const {
|
||||
return *(*find_if(initialObjects.begin(),
|
||||
initialObjects.end(),
|
||||
[&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; }));
|
||||
[&](const std::unique_ptr<gd::Object>& object) {
|
||||
return object->GetName() == name;
|
||||
}));
|
||||
}
|
||||
gd::Object& ObjectsContainer::GetObject(std::size_t index) {
|
||||
return *initialObjects[index];
|
||||
@@ -84,6 +109,22 @@ gd::Object& ObjectsContainer::InsertNewObject(const gd::Project& project,
|
||||
: initialObjects.end(),
|
||||
project.CreateObject(objectType, name))));
|
||||
|
||||
rootFolder->InsertObject(&newlyCreatedObject);
|
||||
|
||||
return newlyCreatedObject;
|
||||
}
|
||||
|
||||
gd::Object& ObjectsContainer::InsertNewObjectInFolder(
|
||||
const gd::Project& project,
|
||||
const gd::String& objectType,
|
||||
const gd::String& name,
|
||||
gd::ObjectFolderOrObject& objectFolderOrObject,
|
||||
std::size_t position) {
|
||||
gd::Object& newlyCreatedObject = *(*(initialObjects.insert(
|
||||
initialObjects.end(), project.CreateObject(objectType, name))));
|
||||
|
||||
objectFolderOrObject.InsertObject(&newlyCreatedObject, position);
|
||||
|
||||
return newlyCreatedObject;
|
||||
}
|
||||
|
||||
@@ -97,16 +138,6 @@ gd::Object& ObjectsContainer::InsertObject(const gd::Object& object,
|
||||
return newlyCreatedObject;
|
||||
}
|
||||
|
||||
void ObjectsContainer::SwapObjects(std::size_t firstObjectIndex,
|
||||
std::size_t secondObjectIndex) {
|
||||
if (firstObjectIndex >= initialObjects.size() ||
|
||||
secondObjectIndex >= initialObjects.size())
|
||||
return;
|
||||
|
||||
std::iter_swap(initialObjects.begin() + firstObjectIndex,
|
||||
initialObjects.begin() + secondObjectIndex);
|
||||
}
|
||||
|
||||
void ObjectsContainer::MoveObject(std::size_t oldIndex, std::size_t newIndex) {
|
||||
if (oldIndex >= initialObjects.size() || newIndex >= initialObjects.size())
|
||||
return;
|
||||
@@ -120,30 +151,59 @@ void ObjectsContainer::RemoveObject(const gd::String& name) {
|
||||
std::vector<std::unique_ptr<gd::Object>>::iterator objectIt =
|
||||
find_if(initialObjects.begin(),
|
||||
initialObjects.end(),
|
||||
[&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; });
|
||||
[&](const std::unique_ptr<gd::Object>& object) {
|
||||
return object->GetName() == name;
|
||||
});
|
||||
if (objectIt == initialObjects.end()) return;
|
||||
|
||||
rootFolder->RemoveRecursivelyObjectNamed(name);
|
||||
|
||||
initialObjects.erase(objectIt);
|
||||
}
|
||||
|
||||
void ObjectsContainer::MoveObjectToAnotherContainer(
|
||||
const gd::String& name,
|
||||
void ObjectsContainer::MoveObjectFolderOrObjectToAnotherContainerInFolder(
|
||||
gd::ObjectFolderOrObject& objectFolderOrObject,
|
||||
gd::ObjectsContainer& newContainer,
|
||||
gd::ObjectFolderOrObject& newParentFolder,
|
||||
std::size_t newPosition) {
|
||||
std::vector<std::unique_ptr<gd::Object>>::iterator objectIt =
|
||||
find_if(initialObjects.begin(),
|
||||
initialObjects.end(),
|
||||
[&](const std::unique_ptr<gd::Object>& object) { return object->GetName() == name; });
|
||||
if (objectFolderOrObject.IsFolder() || !newParentFolder.IsFolder()) return;
|
||||
|
||||
std::vector<std::unique_ptr<gd::Object>>::iterator objectIt = find_if(
|
||||
initialObjects.begin(),
|
||||
initialObjects.end(),
|
||||
[&objectFolderOrObject](std::unique_ptr<gd::Object>& object) {
|
||||
return object->GetName() == objectFolderOrObject.GetObject().GetName();
|
||||
});
|
||||
if (objectIt == initialObjects.end()) return;
|
||||
|
||||
std::unique_ptr<gd::Object> object = std::move(*objectIt);
|
||||
initialObjects.erase(objectIt);
|
||||
|
||||
newContainer.initialObjects.insert(
|
||||
newPosition < newContainer.initialObjects.size()
|
||||
? newContainer.initialObjects.begin() + newPosition
|
||||
: newContainer.initialObjects.end(),
|
||||
std::move(object));
|
||||
newContainer.initialObjects.push_back(std::move(object));
|
||||
|
||||
objectFolderOrObject.GetParent().MoveObjectFolderOrObjectToAnotherFolder(
|
||||
objectFolderOrObject, newParentFolder, newPosition);
|
||||
}
|
||||
|
||||
std::vector<const ObjectFolderOrObject*>
|
||||
ObjectsContainer::GetAllObjectFolderOrObjects() const {
|
||||
std::vector<const ObjectFolderOrObject*> results;
|
||||
|
||||
std::function<void(const ObjectFolderOrObject& folder)> addChildrenOfFolder =
|
||||
[&](const ObjectFolderOrObject& folder) {
|
||||
for (size_t i = 0; i < folder.GetChildrenCount(); ++i) {
|
||||
const auto& child = folder.GetChildAt(i);
|
||||
results.push_back(&child);
|
||||
|
||||
if (child.IsFolder()) {
|
||||
addChildrenOfFolder(child);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
addChildrenOfFolder(*rootFolder);
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
} // namespace gd
|
||||
|
@@ -9,11 +9,12 @@
|
||||
#include <vector>
|
||||
#include "GDCore/String.h"
|
||||
#include "GDCore/Project/ObjectGroupsContainer.h"
|
||||
#include "GDCore/Project/ObjectFolderOrObject.h"
|
||||
namespace gd {
|
||||
class Object;
|
||||
class Project;
|
||||
class SerializerElement;
|
||||
}
|
||||
} // namespace gd
|
||||
#undef GetObject // Disable an annoying macro
|
||||
|
||||
namespace gd {
|
||||
@@ -98,6 +99,19 @@ class GD_CORE_API ObjectsContainer {
|
||||
const gd::String& objectType,
|
||||
const gd::String& name,
|
||||
std::size_t position);
|
||||
/**
|
||||
* \brief Add a new empty object of type \a objectType called \a name in the
|
||||
* given folder at the specified position.<br>
|
||||
*
|
||||
* \note The object is created using the project's current platform.
|
||||
* \return A reference to the object in the list.
|
||||
*/
|
||||
gd::Object& InsertNewObjectInFolder(
|
||||
const gd::Project& project,
|
||||
const gd::String& objectType,
|
||||
const gd::String& name,
|
||||
gd::ObjectFolderOrObject& objectFolderOrObject,
|
||||
std::size_t position);
|
||||
|
||||
/**
|
||||
* \brief Add a new object to the list
|
||||
@@ -125,18 +139,18 @@ class GD_CORE_API ObjectsContainer {
|
||||
void MoveObject(std::size_t oldIndex, std::size_t newIndex);
|
||||
|
||||
/**
|
||||
* \brief Swap the position of the specified objects.
|
||||
*/
|
||||
void SwapObjects(std::size_t firstObjectIndex, std::size_t secondObjectIndex);
|
||||
|
||||
/**
|
||||
* Move the specified object to another container, removing it from the current one
|
||||
* and adding it to the new one at the specified position.
|
||||
* Move the specified object to another container, removing it from the
|
||||
* current one and adding it to the new one at the specified position in the
|
||||
* given folder.
|
||||
*
|
||||
* \note This does not invalidate the references to the object (object is not moved in memory,
|
||||
* as referenced by smart pointers internally).
|
||||
* \note This does not invalidate the references to the object (object is not
|
||||
* moved in memory, as referenced by smart pointers internally).
|
||||
*/
|
||||
void MoveObjectToAnotherContainer(const gd::String& name, gd::ObjectsContainer & newContainer, std::size_t newPosition);
|
||||
void MoveObjectFolderOrObjectToAnotherContainerInFolder(
|
||||
gd::ObjectFolderOrObject& objectFolderOrObject,
|
||||
gd::ObjectsContainer& newContainer,
|
||||
gd::ObjectFolderOrObject& newParentFolder,
|
||||
std::size_t newPosition);
|
||||
|
||||
/**
|
||||
* Provide a raw access to the vector containing the objects
|
||||
@@ -153,20 +167,43 @@ class GD_CORE_API ObjectsContainer {
|
||||
}
|
||||
///@}
|
||||
|
||||
/**
|
||||
* Returns a vector containing all object and folders in this container.
|
||||
* Only use this for checking if you hold a valid `ObjectFolderOrObject` -
|
||||
* don't use this for rendering or anything else.
|
||||
*/
|
||||
std::vector<const ObjectFolderOrObject*> GetAllObjectFolderOrObjects() const;
|
||||
|
||||
gd::ObjectFolderOrObject& GetRootFolder() {
|
||||
return *rootFolder;
|
||||
}
|
||||
|
||||
void AddMissingObjectsInRootFolder();
|
||||
|
||||
/** \name Saving and loading
|
||||
* Members functions related to saving and loading the objects of the class.
|
||||
*/
|
||||
///@{
|
||||
/**
|
||||
* \brief Serialize instances container.
|
||||
* \brief Serialize the objects container.
|
||||
*/
|
||||
void SerializeObjectsTo(SerializerElement& element) const;
|
||||
|
||||
/**
|
||||
* \brief Unserialize the instances container.
|
||||
* \brief Unserialize the objects container.
|
||||
*/
|
||||
void UnserializeObjectsFrom(gd::Project& project,
|
||||
const SerializerElement& element);
|
||||
/**
|
||||
* \brief Serialize folder structure.
|
||||
*/
|
||||
void SerializeFoldersTo(SerializerElement& element) const;
|
||||
|
||||
/**
|
||||
* \brief Unserialize folder structure.
|
||||
*/
|
||||
void UnserializeFoldersFrom(gd::Project& project,
|
||||
const SerializerElement& element);
|
||||
///@}
|
||||
|
||||
/** \name Objects groups management
|
||||
@@ -190,6 +227,9 @@ class GD_CORE_API ObjectsContainer {
|
||||
std::vector<std::unique_ptr<gd::Object> >
|
||||
initialObjects; ///< Objects contained.
|
||||
gd::ObjectGroupsContainer objectGroups;
|
||||
|
||||
private:
|
||||
std::unique_ptr<gd::ObjectFolderOrObject> rootFolder;
|
||||
};
|
||||
|
||||
} // namespace gd
|
||||
|
@@ -48,11 +48,6 @@ using namespace std;
|
||||
|
||||
namespace gd {
|
||||
|
||||
// By default, disallow unicode in identifiers, but this can be set to true
|
||||
// by the IDE. In the future, this will be set to true by default, keeping backward compatibility.
|
||||
// We keep it disabled by default to progressively ask users to test it in real projects.
|
||||
bool Project::allowUsageOfUnicodeIdentifierNames = false;
|
||||
|
||||
Project::Project()
|
||||
: name(_("Project")),
|
||||
version("1.0.0"),
|
||||
@@ -86,26 +81,24 @@ Project::~Project() {}
|
||||
|
||||
void Project::ResetProjectUuid() { projectUuid = UUID::MakeUuid4(); }
|
||||
|
||||
std::unique_ptr<gd::Object>
|
||||
Project::CreateObject(const gd::String &objectType, const gd::String &name) const {
|
||||
std::unique_ptr<gd::Object> object =
|
||||
gd::make_unique<Object>(name, objectType, CreateObjectConfiguration(objectType));
|
||||
std::unique_ptr<gd::Object> Project::CreateObject(
|
||||
const gd::String& objectType, const gd::String& name) const {
|
||||
std::unique_ptr<gd::Object> object = gd::make_unique<Object>(
|
||||
name, objectType, CreateObjectConfiguration(objectType));
|
||||
|
||||
auto &platform = GetCurrentPlatform();
|
||||
auto &project = *this;
|
||||
auto addDefaultBehavior =
|
||||
[&platform,
|
||||
&project,
|
||||
&object,
|
||||
&objectType](const gd::String& behaviorType) {
|
||||
auto &behaviorMetadata =
|
||||
auto& platform = GetCurrentPlatform();
|
||||
auto& project = *this;
|
||||
auto addDefaultBehavior = [&platform, &project, &object, &objectType](
|
||||
const gd::String& behaviorType) {
|
||||
auto& behaviorMetadata =
|
||||
gd::MetadataProvider::GetBehaviorMetadata(platform, behaviorType);
|
||||
if (MetadataProvider::IsBadBehaviorMetadata(behaviorMetadata)) {
|
||||
gd::LogWarning("Object: " + objectType + " has an unknown default behavior: " + behaviorType);
|
||||
gd::LogWarning("Object: " + objectType +
|
||||
" has an unknown default behavior: " + behaviorType);
|
||||
return;
|
||||
}
|
||||
auto* behavior = object->AddNewBehavior(project, behaviorType,
|
||||
behaviorMetadata.GetDefaultName());
|
||||
auto* behavior = object->AddNewBehavior(
|
||||
project, behaviorType, behaviorMetadata.GetDefaultName());
|
||||
behavior->SetDefaultBehavior(true);
|
||||
};
|
||||
|
||||
@@ -114,18 +107,17 @@ Project::CreateObject(const gd::String &objectType, const gd::String &name) cons
|
||||
addDefaultBehavior("ResizableCapability::ResizableBehavior");
|
||||
addDefaultBehavior("ScalableCapability::ScalableBehavior");
|
||||
addDefaultBehavior("FlippableCapability::FlippableBehavior");
|
||||
}
|
||||
else {
|
||||
auto &objectMetadata = gd::MetadataProvider::GetObjectMetadata(platform, objectType);
|
||||
} else {
|
||||
auto& objectMetadata =
|
||||
gd::MetadataProvider::GetObjectMetadata(platform, objectType);
|
||||
if (MetadataProvider::IsBadObjectMetadata(objectMetadata)) {
|
||||
gd::LogWarning("Object: " + name + " has an unknown type: " + objectType);
|
||||
}
|
||||
for (auto &behaviorType : objectMetadata.GetDefaultBehaviors()) {
|
||||
for (auto& behaviorType : objectMetadata.GetDefaultBehaviors()) {
|
||||
addDefaultBehavior(behaviorType);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return std::move(object);
|
||||
}
|
||||
|
||||
@@ -849,6 +841,11 @@ void Project::UnserializeFrom(const SerializerElement& element) {
|
||||
resourcesManager.UnserializeFrom(
|
||||
element.GetChild("resources", 0, "Resources"));
|
||||
UnserializeObjectsFrom(*this, element.GetChild("objects", 0, "Objects"));
|
||||
if (element.HasChild("objectsFolderStructure")) {
|
||||
UnserializeFoldersFrom(*this, element.GetChild("objectsFolderStructure", 0));
|
||||
}
|
||||
AddMissingObjectsInRootFolder();
|
||||
|
||||
GetVariables().UnserializeFrom(element.GetChild("variables", 0, "Variables"));
|
||||
|
||||
scenes.clear();
|
||||
@@ -1000,6 +997,7 @@ void Project::SerializeTo(SerializerElement& element) const {
|
||||
|
||||
resourcesManager.SerializeTo(element.AddChild("resources"));
|
||||
SerializeObjectsTo(element.AddChild("objects"));
|
||||
SerializeFoldersTo(element.AddChild("objectsFolderStructure"));
|
||||
GetObjectGroups().SerializeTo(element.AddChild("objectsGroups"));
|
||||
GetVariables().SerializeTo(element.AddChild("variables"));
|
||||
|
||||
@@ -1038,28 +1036,18 @@ void Project::SerializeTo(SerializerElement& element) const {
|
||||
externalSourceFilesElement.AddChild("sourceFile"));
|
||||
}
|
||||
|
||||
void Project::AllowUsageOfUnicodeIdentifierNames(bool enable) {
|
||||
allowUsageOfUnicodeIdentifierNames = enable;
|
||||
}
|
||||
|
||||
bool Project::IsNameSafe(const gd::String& name) {
|
||||
if (name.empty()) return false;
|
||||
|
||||
if (isdigit(name[0])) return false;
|
||||
|
||||
if (!allowUsageOfUnicodeIdentifierNames) {
|
||||
gd::String legacyAllowedCharacters =
|
||||
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
|
||||
return !(name.find_first_not_of(legacyAllowedCharacters) != gd::String::npos);
|
||||
} else {
|
||||
for (auto character : name) {
|
||||
if (!GrammarTerminals::IsAllowedInIdentifier(character)) {
|
||||
return false;
|
||||
}
|
||||
for (auto character : name) {
|
||||
if (!GrammarTerminals::IsAllowedInIdentifier(character)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
gd::String Project::GetSafeName(const gd::String& name) {
|
||||
@@ -1069,18 +1057,13 @@ gd::String Project::GetSafeName(const gd::String& name) {
|
||||
|
||||
if (isdigit(name[0])) newName = "_" + newName;
|
||||
|
||||
gd::String legacyAllowedCharacters =
|
||||
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
|
||||
|
||||
for (size_t i = 0;i < newName.size();++i) {
|
||||
// Note that iterating on the characters is not super efficient (O(n^2), which
|
||||
// could be avoided with an iterator), but this function is not critical for performance
|
||||
// (only used to generate a name when a user creates a new entity or rename one).
|
||||
for (size_t i = 0; i < newName.size(); ++i) {
|
||||
// Note that iterating on the characters is not super efficient (O(n^2),
|
||||
// which could be avoided with an iterator), but this function is not
|
||||
// critical for performance (only used to generate a name when a user
|
||||
// creates a new entity or rename one).
|
||||
auto character = newName[i];
|
||||
bool isAllowed =
|
||||
allowUsageOfUnicodeIdentifierNames
|
||||
? GrammarTerminals::IsAllowedInIdentifier(character)
|
||||
: legacyAllowedCharacters.find(character) != gd::String::npos;
|
||||
bool isAllowed = GrammarTerminals::IsAllowedInIdentifier(character);
|
||||
|
||||
// Replace all unallowed letters by an underscore.
|
||||
if (!isAllowed) {
|
||||
|
@@ -11,12 +11,12 @@
|
||||
|
||||
#include "GDCore/Project/ExtensionProperties.h"
|
||||
#include "GDCore/Project/LoadingScreen.h"
|
||||
#include "GDCore/Project/Watermark.h"
|
||||
#include "GDCore/Project/ObjectGroupsContainer.h"
|
||||
#include "GDCore/Project/ObjectsContainer.h"
|
||||
#include "GDCore/Project/PlatformSpecificAssets.h"
|
||||
#include "GDCore/Project/ResourcesManager.h"
|
||||
#include "GDCore/Project/VariablesContainer.h"
|
||||
#include "GDCore/Project/Watermark.h"
|
||||
#include "GDCore/String.h"
|
||||
namespace gd {
|
||||
class Platform;
|
||||
@@ -82,7 +82,9 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
/**
|
||||
* \brief Change the project description
|
||||
*/
|
||||
void SetDescription(const gd::String& description_) { description = description_; };
|
||||
void SetDescription(const gd::String& description_) {
|
||||
description = description_;
|
||||
};
|
||||
|
||||
/**
|
||||
* \brief Get the project description
|
||||
@@ -124,7 +126,9 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
/**
|
||||
* \brief Get the author usernames of the project.
|
||||
*/
|
||||
const std::vector<gd::String>& GetAuthorUsernames() const { return authorUsernames; };
|
||||
const std::vector<gd::String>& GetAuthorUsernames() const {
|
||||
return authorUsernames;
|
||||
};
|
||||
|
||||
/**
|
||||
* \brief Get the author usernames of the project, to modify them (non-const).
|
||||
@@ -135,7 +139,9 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
* Define the project as playable with a keyboard.
|
||||
* \param enable True to define the project as playable with a keyboard.
|
||||
*/
|
||||
void SetPlayableWithKeyboard(bool playable = true) { isPlayableWithKeyboard = playable; }
|
||||
void SetPlayableWithKeyboard(bool playable = true) {
|
||||
isPlayableWithKeyboard = playable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the project is defined as playable with a keyboard.
|
||||
@@ -146,7 +152,9 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
* Define the project as playable with a gamepad.
|
||||
* \param enable True to define the project as playable with a gamepad.
|
||||
*/
|
||||
void SetPlayableWithGamepad(bool playable = true) { isPlayableWithGamepad = playable; }
|
||||
void SetPlayableWithGamepad(bool playable = true) {
|
||||
isPlayableWithGamepad = playable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the project is defined as playable with a gamepad.
|
||||
@@ -157,7 +165,9 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
* Define the project as playable on a mobile.
|
||||
* \param enable True to define the project as playable on a mobile.
|
||||
*/
|
||||
void SetPlayableWithMobile(bool playable = true) { isPlayableWithMobile = playable; }
|
||||
void SetPlayableWithMobile(bool playable = true) {
|
||||
isPlayableWithMobile = playable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the project is defined as playable on a mobile.
|
||||
@@ -391,17 +401,23 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
/**
|
||||
* Set the antialiasing mode used by the game ("none" or "MSAA").
|
||||
*/
|
||||
void SetAntialiasingMode(const gd::String& antialiasingMode_) { antialiasingMode = antialiasingMode_; }
|
||||
void SetAntialiasingMode(const gd::String& antialiasingMode_) {
|
||||
antialiasingMode = antialiasingMode_;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if antialising is enabled on mobiles.
|
||||
*/
|
||||
bool IsAntialisingEnabledOnMobile() const { return isAntialisingEnabledOnMobile; }
|
||||
bool IsAntialisingEnabledOnMobile() const {
|
||||
return isAntialisingEnabledOnMobile;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set whether antialising is enabled on mobiles or not.
|
||||
*/
|
||||
void SetAntialisingEnabledOnMobile(bool enable) { isAntialisingEnabledOnMobile = enable; }
|
||||
void SetAntialisingEnabledOnMobile(bool enable) {
|
||||
isAntialisingEnabledOnMobile = enable;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Return if the project should set 0 as Z-order for objects created
|
||||
@@ -905,7 +921,8 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
/**
|
||||
* \brief Return the events based object with a given type.
|
||||
*/
|
||||
const gd::EventsBasedObject& GetEventsBasedObject(const gd::String& type) const;
|
||||
const gd::EventsBasedObject& GetEventsBasedObject(
|
||||
const gd::String& type) const;
|
||||
|
||||
/**
|
||||
* \brief Check if events based behavior with a given type exists.
|
||||
@@ -920,7 +937,8 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
/**
|
||||
* \brief Return the events based behavior with a given type.
|
||||
*/
|
||||
const gd::EventsBasedBehavior& GetEventsBasedBehavior(const gd::String& type) const;
|
||||
const gd::EventsBasedBehavior& GetEventsBasedBehavior(
|
||||
const gd::String& type) const;
|
||||
|
||||
///@}
|
||||
|
||||
@@ -969,20 +987,6 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
*/
|
||||
///@{
|
||||
|
||||
/**
|
||||
* Check if unicode names are allowed in identifier names.
|
||||
* \see IsNameSafe
|
||||
* \see GetSafeName
|
||||
*/
|
||||
static bool IsUsageOfUnicodeIdentifierNamesAllowed() { return allowUsageOfUnicodeIdentifierNames; };
|
||||
|
||||
/**
|
||||
* Set if unicode names are allowed in identifier names.
|
||||
* \see IsNameSafe
|
||||
* \see GetSafeName
|
||||
*/
|
||||
static void AllowUsageOfUnicodeIdentifierNames(bool enable);
|
||||
|
||||
/**
|
||||
* Return true if \a name is valid (can be used safely for an object,
|
||||
* behavior, events function name, etc...).
|
||||
@@ -990,8 +994,8 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
static bool IsNameSafe(const gd::String& name);
|
||||
|
||||
/**
|
||||
* Return a name, based on the one passed in parameter, that can be safely used
|
||||
* for an object, behavior, events function name, etc...
|
||||
* Return a name, based on the one passed in parameter, that can be safely
|
||||
* used for an object, behavior, events function name, etc...
|
||||
*/
|
||||
static gd::String GetSafeName(const gd::String& name);
|
||||
///@}
|
||||
@@ -1068,8 +1072,8 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
bool adaptGameResolutionAtRuntime; ///< Should the game resolution be adapted
|
||||
///< to the window size at runtime
|
||||
gd::String
|
||||
sizeOnStartupMode; ///< How to adapt the game size to the screen. Can be
|
||||
///< "adaptWidth", "adaptHeight" or empty
|
||||
sizeOnStartupMode; ///< How to adapt the game size to the screen. Can be
|
||||
///< "adaptWidth", "adaptHeight" or empty
|
||||
gd::String antialiasingMode;
|
||||
bool isAntialisingEnabledOnMobile;
|
||||
gd::String projectUuid; ///< UUID useful to identify the game in online
|
||||
@@ -1095,19 +1099,18 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
externalSourceFiles; ///< List of external source files used.
|
||||
gd::String author; ///< Game author name, for publishing purpose.
|
||||
std::vector<gd::String>
|
||||
authorIds; ///< Game author ids, from GDevelop users DB.
|
||||
authorIds; ///< Game author ids, from GDevelop users DB.
|
||||
std::vector<gd::String>
|
||||
authorUsernames; ///< Game author usernames, from GDevelop users DB.
|
||||
std::vector<gd::String>
|
||||
categories; ///< Game categories
|
||||
bool isPlayableWithKeyboard; ///< The project is playable with a keyboard.
|
||||
bool isPlayableWithGamepad; ///< The project is playable with a gamepad.
|
||||
bool isPlayableWithMobile; ///< The project is playable on a mobile.
|
||||
gd::String packageName; ///< Game package name
|
||||
gd::String templateSlug; ///< The slug of the template from which the game is
|
||||
///< created.
|
||||
gd::String orientation; ///< Lock game orientation (on mobile devices).
|
||||
///< "default", "landscape" or "portrait".
|
||||
authorUsernames; ///< Game author usernames, from GDevelop users DB.
|
||||
std::vector<gd::String> categories; ///< Game categories
|
||||
bool isPlayableWithKeyboard; ///< The project is playable with a keyboard.
|
||||
bool isPlayableWithGamepad; ///< The project is playable with a gamepad.
|
||||
bool isPlayableWithMobile; ///< The project is playable on a mobile.
|
||||
gd::String packageName; ///< Game package name
|
||||
gd::String templateSlug; ///< The slug of the template from which the game is
|
||||
///< created.
|
||||
gd::String orientation; ///< Lock game orientation (on mobile devices).
|
||||
///< "default", "landscape" or "portrait".
|
||||
bool
|
||||
folderProject; ///< True if folder project, false if single file project.
|
||||
gd::String
|
||||
@@ -1128,8 +1131,6 @@ class GD_CORE_API Project : public ObjectsContainer {
|
||||
///< time the project was saved.
|
||||
mutable unsigned int gdBuildVersion; ///< The GD build version used the last
|
||||
///< time the project was saved.
|
||||
|
||||
static bool allowUsageOfUnicodeIdentifierNames;
|
||||
};
|
||||
|
||||
} // namespace gd
|
||||
|
@@ -39,16 +39,18 @@ module.exports = {
|
||||
.setIcon('res/conditions/3d_box.svg');
|
||||
|
||||
{
|
||||
const base3D = extension.addBehavior(
|
||||
"Base3DBehavior",
|
||||
_("3D capability"),
|
||||
"Object3D",
|
||||
_("Move the object in 3D space."),
|
||||
"",
|
||||
"res/conditions/3d_box.svg",
|
||||
"Base3DBehavior",
|
||||
const base3D = extension
|
||||
.addBehavior(
|
||||
'Base3DBehavior',
|
||||
_('3D capability'),
|
||||
'Object3D',
|
||||
_('Move the object in 3D space.'),
|
||||
'',
|
||||
'res/conditions/3d_box.svg',
|
||||
'Base3DBehavior',
|
||||
new gd.Behavior(),
|
||||
new gd.BehaviorsSharedData())
|
||||
new gd.BehaviorsSharedData()
|
||||
)
|
||||
.setHidden()
|
||||
.setIncludeFile('Extensions/3D/Base3DBehavior.js');
|
||||
|
||||
@@ -63,11 +65,11 @@ module.exports = {
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
|
||||
.setFunctionName('setZ')
|
||||
.setGetter('getZ');
|
||||
|
||||
|
||||
base3D
|
||||
.addExpressionAndConditionAndAction(
|
||||
'number',
|
||||
@@ -95,23 +97,23 @@ module.exports = {
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
|
||||
.setFunctionName('setDepth')
|
||||
.setGetter('getDepth');
|
||||
|
||||
base3D
|
||||
base3D
|
||||
.addExpressionAndConditionAndAction(
|
||||
'number',
|
||||
'ScaleZ',
|
||||
_('Scale on Z axis'),
|
||||
_("the scale on Z axis of an object (default scale is 1)"),
|
||||
_("the scale on Z axis scale"),
|
||||
_('Scale'),
|
||||
_('the scale on Z axis of an object (default scale is 1)'),
|
||||
_('the scale on Z axis scale'),
|
||||
_('Size'),
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.useStandardParameters(
|
||||
'number',
|
||||
gd.ParameterOptions.makeNewOptions().setDescription(
|
||||
@@ -122,7 +124,7 @@ module.exports = {
|
||||
.setFunctionName('setScaleZ')
|
||||
.setGetter('getScaleZ');
|
||||
|
||||
base3D
|
||||
base3D
|
||||
.addScopedAction(
|
||||
'FlipZ',
|
||||
_('Flip the object on Z'),
|
||||
@@ -133,12 +135,12 @@ module.exports = {
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.addParameter('yesorno', _('Activate flipping'))
|
||||
.markAsSimple()
|
||||
.setFunctionName('flipZ');
|
||||
|
||||
base3D
|
||||
base3D
|
||||
.addScopedCondition(
|
||||
'FlippedZ',
|
||||
_('Flipped on Z'),
|
||||
@@ -149,10 +151,10 @@ module.exports = {
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.setFunctionName('isFlippedZ');
|
||||
|
||||
base3D
|
||||
base3D
|
||||
.addExpressionAndConditionAndAction(
|
||||
'number',
|
||||
'RotationX',
|
||||
@@ -163,12 +165,12 @@ module.exports = {
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
|
||||
.setFunctionName('setRotationX')
|
||||
.setGetter('getRotationX');
|
||||
|
||||
base3D
|
||||
base3D
|
||||
.addExpressionAndConditionAndAction(
|
||||
'number',
|
||||
'RotationY',
|
||||
@@ -179,12 +181,12 @@ module.exports = {
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
|
||||
.setFunctionName('setRotationY')
|
||||
.setGetter('getRotationY');
|
||||
|
||||
base3D
|
||||
base3D
|
||||
.addScopedAction(
|
||||
'TurnAroundX',
|
||||
_('Turn around X axis'),
|
||||
@@ -197,12 +199,12 @@ module.exports = {
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.addParameter('number', _('Rotation angle'), '', false)
|
||||
.markAsAdvanced()
|
||||
.setFunctionName('turnAroundX');
|
||||
|
||||
base3D
|
||||
base3D
|
||||
.addScopedAction(
|
||||
'TurnAroundY',
|
||||
_('Turn around Y axis'),
|
||||
@@ -215,12 +217,12 @@ module.exports = {
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.addParameter('number', _('Rotation angle'), '', false)
|
||||
.markAsAdvanced()
|
||||
.setFunctionName('turnAroundY');
|
||||
|
||||
base3D
|
||||
base3D
|
||||
.addScopedAction(
|
||||
'TurnAroundZ',
|
||||
_('Turn around Z axis'),
|
||||
@@ -233,7 +235,7 @@ module.exports = {
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
.addParameter('object', _('3D object'))
|
||||
.addParameter("behavior", _("Behavior"), "Base3DBehavior")
|
||||
.addParameter('behavior', _('Behavior'), 'Base3DBehavior')
|
||||
.addParameter('number', _('Rotation angle'), '', false)
|
||||
.markAsAdvanced()
|
||||
.setFunctionName('turnAroundZ');
|
||||
@@ -244,17 +246,18 @@ module.exports = {
|
||||
.addObject(
|
||||
'Model3DObject',
|
||||
_('3D Model'),
|
||||
_('A 3D model.'),
|
||||
_('An animated 3D model.'),
|
||||
'JsPlatform/Extensions/3d_box.svg',
|
||||
new gd.Model3DObjectConfiguration()
|
||||
)
|
||||
.setCategoryFullName(_('3D'))
|
||||
// Effects are unsupported because the object is not rendered with PIXI.
|
||||
.setCategoryFullName(_('General'))
|
||||
// Effects are unsupported because the object is not rendered with PIXI.
|
||||
.addDefaultBehavior('ResizableCapability::ResizableBehavior')
|
||||
.addDefaultBehavior('ScalableCapability::ScalableBehavior')
|
||||
.addDefaultBehavior('FlippableCapability::FlippableBehavior')
|
||||
.addDefaultBehavior('AnimatableCapability::AnimatableBehavior')
|
||||
.addDefaultBehavior('Scene3D::Base3DBehavior')
|
||||
.markAsRenderedIn3D()
|
||||
.setIncludeFile('Extensions/3D/A_RuntimeObject3D.js')
|
||||
.addIncludeFile('Extensions/3D/A_RuntimeObject3DRenderer.js')
|
||||
.addIncludeFile('Extensions/3D/Model3DRuntimeObject.js')
|
||||
@@ -279,7 +282,6 @@ module.exports = {
|
||||
.setFunctionName('setZ')
|
||||
.setGetter('getZ');
|
||||
|
||||
|
||||
// Deprecated
|
||||
object
|
||||
.addExpressionAndConditionAndAction(
|
||||
@@ -1125,16 +1127,17 @@ module.exports = {
|
||||
.addObject(
|
||||
'Cube3DObject',
|
||||
_('3D Box'),
|
||||
_('A 3D box.'),
|
||||
_('A box with images for each face'),
|
||||
'JsPlatform/Extensions/3d_box.svg',
|
||||
Cube3DObject
|
||||
)
|
||||
.setCategoryFullName(_('3D'))
|
||||
.setCategoryFullName(_('General'))
|
||||
// Effects are unsupported because the object is not rendered with PIXI.
|
||||
.addDefaultBehavior('ResizableCapability::ResizableBehavior')
|
||||
.addDefaultBehavior('ScalableCapability::ScalableBehavior')
|
||||
.addDefaultBehavior('FlippableCapability::FlippableBehavior')
|
||||
.addDefaultBehavior('Scene3D::Base3DBehavior')
|
||||
.markAsRenderedIn3D()
|
||||
.setIncludeFile('Extensions/3D/A_RuntimeObject3D.js')
|
||||
.addIncludeFile('Extensions/3D/A_RuntimeObject3DRenderer.js')
|
||||
.addIncludeFile('Extensions/3D/Cube3DRuntimeObject.js')
|
||||
@@ -1159,7 +1162,7 @@ module.exports = {
|
||||
.setFunctionName('setZ')
|
||||
.setGetter('getZ');
|
||||
|
||||
// Deprecated
|
||||
// Deprecated
|
||||
object
|
||||
.addExpressionAndConditionAndAction(
|
||||
'number',
|
||||
@@ -1304,7 +1307,7 @@ module.exports = {
|
||||
.setFunctionName('setScaleX')
|
||||
.setGetter('getScaleX');
|
||||
|
||||
// Deprecated
|
||||
// Deprecated
|
||||
object
|
||||
.addExpressionAndConditionAndAction(
|
||||
'number',
|
||||
@@ -1662,7 +1665,7 @@ module.exports = {
|
||||
'Change the camera rotation to look at an object. The camera top always face the screen.'
|
||||
),
|
||||
_('Change the camera rotation of _PARAM2_ to look at _PARAM1_'),
|
||||
'',
|
||||
_("Layers and cameras"),
|
||||
'res/conditions/3d_box.svg',
|
||||
'res/conditions/3d_box.svg'
|
||||
)
|
||||
@@ -2096,6 +2099,12 @@ module.exports = {
|
||||
this.updateTexture();
|
||||
}
|
||||
|
||||
onRemovedFromScene() {
|
||||
super.onRemovedFromScene();
|
||||
// Keep textures because they are shared by all sprites.
|
||||
this._pixiObject.destroy({ children: true });
|
||||
}
|
||||
|
||||
static _getResourceNameToDisplay(objectConfiguration) {
|
||||
return getFirstVisibleFaceResourceName(objectConfiguration);
|
||||
}
|
||||
@@ -2160,17 +2169,18 @@ module.exports = {
|
||||
updatePIXISprite() {
|
||||
const width = this.getWidth();
|
||||
const height = this.getHeight();
|
||||
const objectTextureFrame = this._pixiTexturedObject.texture.frame;
|
||||
// In case the texture is not loaded yet, we don't want to crash.
|
||||
if (!objectTextureFrame) return;
|
||||
|
||||
this._pixiTexturedObject.anchor.x =
|
||||
this._centerX / this._pixiTexturedObject.texture.frame.width;
|
||||
this._centerX / objectTextureFrame.width;
|
||||
this._pixiTexturedObject.anchor.y =
|
||||
this._centerY / this._pixiTexturedObject.texture.frame.height;
|
||||
this._centerY / objectTextureFrame.height;
|
||||
|
||||
this._pixiTexturedObject.angle = this._instance.getAngle();
|
||||
this._pixiTexturedObject.scale.x =
|
||||
width / this._pixiTexturedObject.texture.frame.width;
|
||||
this._pixiTexturedObject.scale.y =
|
||||
height / this._pixiTexturedObject.texture.frame.height;
|
||||
this._pixiTexturedObject.scale.x = width / objectTextureFrame.width;
|
||||
this._pixiTexturedObject.scale.y = height / objectTextureFrame.height;
|
||||
|
||||
this._pixiTexturedObject.position.x =
|
||||
this._instance.getX() +
|
||||
@@ -2679,6 +2689,11 @@ module.exports = {
|
||||
});
|
||||
}
|
||||
|
||||
onRemovedFromScene() {
|
||||
super.onRemovedFromScene();
|
||||
this._pixiObject.destroy({ children: true });
|
||||
}
|
||||
|
||||
static getThumbnail(project, resourcesLoader, objectConfiguration) {
|
||||
return 'JsPlatform/Extensions/3d_box.svg';
|
||||
}
|
||||
|
@@ -221,6 +221,9 @@ namespace gdjs {
|
||||
const animation = this._animations[animationIndex];
|
||||
this._currentAnimationIndex = animationIndex;
|
||||
this._renderer.playAnimation(animation.source, animation.loop);
|
||||
if (this._animationPaused) {
|
||||
this._renderer.pauseAnimation();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -272,12 +275,12 @@ namespace gdjs {
|
||||
|
||||
pauseAnimation() {
|
||||
this._animationPaused = true;
|
||||
return this._renderer.pauseAnimation();
|
||||
this._renderer.pauseAnimation();
|
||||
}
|
||||
|
||||
resumeAnimation() {
|
||||
this._animationPaused = false;
|
||||
return this._renderer.resumeAnimation();
|
||||
this._renderer.resumeAnimation();
|
||||
}
|
||||
|
||||
getAnimationSpeedScale() {
|
||||
@@ -288,6 +291,20 @@ namespace gdjs {
|
||||
this._animationSpeedScale = ratio;
|
||||
}
|
||||
|
||||
getAnimationElapsedTime(): float {
|
||||
return this._renderer.getAnimationElapsedTime();
|
||||
}
|
||||
|
||||
setAnimationElapsedTime(time: float): void {
|
||||
this._renderer.setAnimationElapsedTime(time);
|
||||
}
|
||||
|
||||
getAnimationDuration(): float {
|
||||
return this._renderer.getAnimationDuration(
|
||||
this._animations[this._currentAnimationIndex].source
|
||||
);
|
||||
}
|
||||
|
||||
getCenterX(): float {
|
||||
const centerPoint = this._renderer.getCenterPoint();
|
||||
return this.getWidth() * centerPoint[0];
|
||||
|
@@ -348,6 +348,24 @@ namespace gdjs {
|
||||
// Make sure the first frame is displayed.
|
||||
this._animationMixer.update(0);
|
||||
}
|
||||
|
||||
getAnimationElapsedTime(): float {
|
||||
return this._action ? this._action.time : 0;
|
||||
}
|
||||
|
||||
setAnimationElapsedTime(time: float): void {
|
||||
if (this._action) {
|
||||
this._action.time = time;
|
||||
}
|
||||
}
|
||||
|
||||
getAnimationDuration(animationName: string): float {
|
||||
const clip = THREE.AnimationClip.findByName(
|
||||
this._originalModel.animations,
|
||||
animationName
|
||||
);
|
||||
return clip ? clip.duration : 0;
|
||||
}
|
||||
}
|
||||
|
||||
export const Model3DRuntimeObjectRenderer = Model3DRuntimeObject3DRenderer;
|
||||
|
@@ -126,6 +126,10 @@ namespace gdjs {
|
||||
getHeight(): float {
|
||||
return this._pixiObject.height;
|
||||
}
|
||||
|
||||
destroy(): void {
|
||||
this._pixiObject.destroy(true);
|
||||
}
|
||||
}
|
||||
|
||||
export const BBTextRuntimeObjectRenderer = BBTextRuntimeObjectPixiRenderer;
|
||||
|
@@ -130,8 +130,9 @@ namespace gdjs {
|
||||
}
|
||||
}
|
||||
|
||||
onDestroyFromScene(instanceContainer: gdjs.RuntimeInstanceContainer): void {
|
||||
super.onDestroyFromScene(instanceContainer);
|
||||
onDestroyed(): void {
|
||||
super.onDestroyed();
|
||||
this._renderer.destroy();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -176,10 +176,12 @@ module.exports = {
|
||||
'Extensions/BitmapText/bitmaptextruntimeobject-pixi-renderer.js'
|
||||
)
|
||||
.setCategoryFullName(_('Text'))
|
||||
.addDefaultBehavior("TextContainerCapability::TextContainerBehavior")
|
||||
.addDefaultBehavior('EffectCapability::EffectBehavior')
|
||||
.addDefaultBehavior('OpacityCapability::OpacityBehavior')
|
||||
.addDefaultBehavior('ScalableCapability::ScalableBehavior');
|
||||
|
||||
// Deprecated
|
||||
object
|
||||
.addExpressionAndConditionAndAction(
|
||||
'string',
|
||||
@@ -190,11 +192,23 @@ module.exports = {
|
||||
'',
|
||||
'res/conditions/text24_black.png'
|
||||
)
|
||||
.setHidden()
|
||||
.addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
|
||||
.useStandardParameters('string', gd.ParameterOptions.makeNewOptions())
|
||||
.setFunctionName('setText')
|
||||
.setGetter('getText');
|
||||
|
||||
object
|
||||
.addStrExpression(
|
||||
'Text',
|
||||
_('Text'),
|
||||
_('Return the text.'),
|
||||
'',
|
||||
'res/conditions/text24_black.png'
|
||||
)
|
||||
.addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
|
||||
.setFunctionName('getText');
|
||||
|
||||
// Deprecated
|
||||
object
|
||||
.addExpressionAndConditionAndAction(
|
||||
@@ -282,6 +296,7 @@ module.exports = {
|
||||
.getCodeExtraInformation()
|
||||
.setFunctionName('setTint');
|
||||
|
||||
// Deprecated
|
||||
object
|
||||
.addAction(
|
||||
'SetBitmapFontAndTextureAtlasResourceName',
|
||||
@@ -294,6 +309,7 @@ module.exports = {
|
||||
'res/actions/font24.png',
|
||||
'res/actions/font.png'
|
||||
)
|
||||
.setHidden()
|
||||
.addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
|
||||
.addParameter(
|
||||
'bitmapFontResource',
|
||||
@@ -311,6 +327,34 @@ module.exports = {
|
||||
.getCodeExtraInformation()
|
||||
.setFunctionName('setBitmapFontAndTextureAtlasResourceName');
|
||||
|
||||
object
|
||||
.addAction(
|
||||
'SetBitmapFontAndTextureAtlasResourceName2',
|
||||
_('Bitmap files resources'),
|
||||
_('Change the Bitmap Font and/or the atlas image used by the object.'),
|
||||
_(
|
||||
'Set the bitmap font of _PARAM0_ to _PARAM1_ and the atlas to _PARAM2_'
|
||||
),
|
||||
'',
|
||||
'res/actions/font24.png',
|
||||
'res/actions/font.png'
|
||||
)
|
||||
.addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
|
||||
.addParameter(
|
||||
'bitmapFontResource',
|
||||
_('Bitmap font resource name'),
|
||||
'',
|
||||
false
|
||||
)
|
||||
.addParameter(
|
||||
'imageResource',
|
||||
_('Texture atlas resource name'),
|
||||
'',
|
||||
false
|
||||
)
|
||||
.getCodeExtraInformation()
|
||||
.setFunctionName('setBitmapFontAndTextureAtlasResourceName');
|
||||
|
||||
object
|
||||
.addExpressionAndCondition(
|
||||
'string',
|
||||
|
@@ -37,7 +37,7 @@ namespace gdjs {
|
||||
*/
|
||||
export class BitmapTextRuntimeObject
|
||||
extends gdjs.RuntimeObject
|
||||
implements gdjs.OpacityHandler, gdjs.Scalable {
|
||||
implements gdjs.TextContainer, gdjs.OpacityHandler, gdjs.Scalable {
|
||||
_opacity: float;
|
||||
_text: string;
|
||||
/** color in format [r, g, b], where each component is in the range [0, 255] */
|
||||
@@ -141,8 +141,8 @@ namespace gdjs {
|
||||
}
|
||||
}
|
||||
|
||||
onDestroyFromScene(instanceContainer: gdjs.RuntimeInstanceContainer): void {
|
||||
super.onDestroyFromScene(instanceContainer);
|
||||
onDestroyed(): void {
|
||||
super.onDestroyed();
|
||||
this._renderer.onDestroy();
|
||||
}
|
||||
|
||||
|
@@ -41,7 +41,7 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
|
||||
_("Compare the additional border that the object must cross "
|
||||
"before being deleted."),
|
||||
_("the additional border"),
|
||||
"",
|
||||
_("Destroy outside configuration"),
|
||||
"CppPlatform/Extensions/destroyoutsideicon24.png",
|
||||
"CppPlatform/Extensions/destroyoutsideicon16.png")
|
||||
.AddParameter("object", _("Object"))
|
||||
@@ -56,7 +56,7 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
|
||||
_("Change the additional border that the object must cross "
|
||||
"before being deleted."),
|
||||
_("the additional border"),
|
||||
"",
|
||||
_("Destroy outside configuration"),
|
||||
"CppPlatform/Extensions/destroyoutsideicon24.png",
|
||||
"CppPlatform/Extensions/destroyoutsideicon16.png")
|
||||
.AddParameter("object", _("Object"))
|
||||
|
@@ -39,7 +39,7 @@ void DeclareDraggableBehaviorExtension(gd::PlatformExtension& extension) {
|
||||
_("Being dragged"),
|
||||
_("Check if the object is being dragged."),
|
||||
_("_PARAM0_ is being dragged"),
|
||||
"",
|
||||
_("Draggable"),
|
||||
"CppPlatform/Extensions/draggableicon24.png",
|
||||
"CppPlatform/Extensions/draggableicon16.png")
|
||||
|
||||
@@ -51,7 +51,7 @@ void DeclareDraggableBehaviorExtension(gd::PlatformExtension& extension) {
|
||||
_("Was just dropped"),
|
||||
_("Check if the object was just dropped after being dragged."),
|
||||
_("_PARAM0_ was just dropped"),
|
||||
"",
|
||||
_("Draggable"),
|
||||
"CppPlatform/Extensions/draggableicon24.png",
|
||||
"CppPlatform/Extensions/draggableicon16.png")
|
||||
|
||||
|
@@ -725,6 +725,44 @@ module.exports = {
|
||||
.setType('number')
|
||||
.setDescription(_('Padding for the visual effect area'));
|
||||
|
||||
const hslAdjustmentEffect = extension
|
||||
.addEffect('HslAdjustment')
|
||||
.setFullName(_('HSL Adjustment'))
|
||||
.setDescription(
|
||||
_(
|
||||
'Adjust hue, saturation and lightness.'
|
||||
)
|
||||
)
|
||||
.markAsOnlyWorkingFor2D()
|
||||
.addIncludeFile('Extensions/Effects/pixi-filters/filter-hsl-adjustment.js')
|
||||
.addIncludeFile('Extensions/Effects/hsl-adjustment-pixi-filter.js');
|
||||
const hslAdjustmentProperties = hslAdjustmentEffect.getProperties();
|
||||
hslAdjustmentProperties
|
||||
.getOrCreate('hue')
|
||||
.setValue('0')
|
||||
.setLabel(_('Hue in degrees (between -180 and 180)'))
|
||||
.setType('number');
|
||||
hslAdjustmentProperties
|
||||
.getOrCreate('saturation')
|
||||
.setValue('0')
|
||||
.setLabel(_('Saturation (between -1 and 1)'))
|
||||
.setType('number');
|
||||
hslAdjustmentProperties
|
||||
.getOrCreate('lightness')
|
||||
.setValue('0')
|
||||
.setLabel(_('Lightness (between -1 and 1)'))
|
||||
.setType('number');
|
||||
hslAdjustmentProperties
|
||||
.getOrCreate('colorize')
|
||||
.setValue('false')
|
||||
.setLabel(_('Colorize from the grayscale image'))
|
||||
.setType('boolean');
|
||||
hslAdjustmentProperties
|
||||
.getOrCreate('alpha')
|
||||
.setValue('1')
|
||||
.setLabel(_('Alpha (between 0 and 1, 0 is transparent)'))
|
||||
.setType('number');
|
||||
|
||||
const kawaseBlurEffect = extension
|
||||
.addEffect('KawaseBlur')
|
||||
.setFullName(_('Blur (Kawase, fast)'))
|
||||
@@ -775,6 +813,38 @@ module.exports = {
|
||||
.setLabel(_('Opacity (between 0 and 1)'))
|
||||
.setType('number');
|
||||
|
||||
const motionBlurEffect = extension
|
||||
.addEffect('MotionBlur')
|
||||
.setFullName(_('Motion Blur'))
|
||||
.setDescription(
|
||||
_('Blur the rendered image to give a feeling of speed.')
|
||||
)
|
||||
.markAsOnlyWorkingFor2D()
|
||||
.addIncludeFile('Extensions/Effects/pixi-filters/filter-motion-blur.js')
|
||||
.addIncludeFile('Extensions/Effects/motion-blur-pixi-filter.js');
|
||||
const motionBlurProperties = motionBlurEffect.getProperties();
|
||||
motionBlurProperties
|
||||
.getOrCreate('velocityX')
|
||||
.setValue('0')
|
||||
.setLabel(_('Velocity on X axis'))
|
||||
.setType('number');
|
||||
motionBlurProperties
|
||||
.getOrCreate('velocityY')
|
||||
.setValue('0')
|
||||
.setLabel(_('Velocity on Y axis'))
|
||||
.setType('number');
|
||||
motionBlurProperties
|
||||
.getOrCreate('kernelSize')
|
||||
.setValue('5')
|
||||
.setLabel(_('Kernel size (odd number between 3 and 25)'))
|
||||
.setType('number')
|
||||
.setDescription(_('Quality of the blur.'));
|
||||
motionBlurProperties
|
||||
.getOrCreate('offset')
|
||||
.setValue('0')
|
||||
.setLabel(_('Offset'))
|
||||
.setType('number');
|
||||
|
||||
const nightEffect = extension
|
||||
.addEffect('Night')
|
||||
.setFullName(_('Dark Night'))
|
||||
@@ -1089,6 +1159,59 @@ module.exports = {
|
||||
.setLabel(_('Opacity (between 0 and 1)'))
|
||||
.setType('number');
|
||||
|
||||
const shockwaveEffect = extension
|
||||
.addEffect('Shockwave')
|
||||
.setFullName(_('Shockwave'))
|
||||
.setDescription(
|
||||
_('Deform the image the way a drop deforms a water surface.')
|
||||
)
|
||||
.markAsOnlyWorkingFor2D()
|
||||
.addIncludeFile('Extensions/Effects/pixi-filters/filter-shockwave.js')
|
||||
.addIncludeFile('Extensions/Effects/shockwave-pixi-filter.js');
|
||||
const shockwaveEffectProperties = shockwaveEffect.getProperties();
|
||||
shockwaveEffectProperties
|
||||
.getOrCreate('time')
|
||||
.setValue('0')
|
||||
.setLabel(_('Elapsed time'))
|
||||
.setType('number')
|
||||
.setDescription('It can be set back to 0 to play the shockwave animation again.');
|
||||
shockwaveEffectProperties
|
||||
.getOrCreate('speed')
|
||||
.setValue('500')
|
||||
.setLabel(_('Spreading speed (in pixels per second)'))
|
||||
.setType('number');
|
||||
shockwaveEffectProperties
|
||||
.getOrCreate('amplitude')
|
||||
.setValue('50')
|
||||
.setLabel(_('Amplitude'))
|
||||
.setType('number');
|
||||
shockwaveEffectProperties
|
||||
.getOrCreate('wavelength')
|
||||
.setValue('200')
|
||||
.setLabel(_('Wavelength'))
|
||||
.setType('number');
|
||||
shockwaveEffectProperties
|
||||
.getOrCreate('brightness')
|
||||
.setValue('1')
|
||||
.setLabel(_('Brightness'))
|
||||
.setType('number');
|
||||
shockwaveEffectProperties
|
||||
.getOrCreate('radius')
|
||||
.setValue('0')
|
||||
.setLabel(_('Maximum radius (0 for infinity)'))
|
||||
.setType('number');
|
||||
shockwaveEffectProperties
|
||||
.getOrCreate('centerX')
|
||||
.setValue('0.5')
|
||||
.setLabel(_('Center on X axis'))
|
||||
.setType('number');
|
||||
shockwaveEffectProperties
|
||||
.getOrCreate('centerY')
|
||||
.setValue('0.5')
|
||||
.setLabel(_('Center on Y axis'))
|
||||
.setType('number')
|
||||
.setDescription('(0,0) is the top-left and (1,1) is the bottom right.');
|
||||
|
||||
const tiltShiftEffect = extension
|
||||
.addEffect('TiltShift')
|
||||
.setFullName(_('Tilt shift'))
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Adjustment',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const adjustmentFilter = new PIXI.filters.AdjustmentFilter();
|
||||
return adjustmentFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const adjustmentFilter = (filter as unknown) as PIXI.filters.AdjustmentFilter;
|
||||
if (parameterName === 'gamma') {
|
||||
adjustmentFilter.gamma = value;
|
||||
@@ -27,8 +31,16 @@ namespace gdjs {
|
||||
adjustmentFilter.alpha = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'AdvancedBloom',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const advancedBloomFilter = new PIXI.filters.AdvancedBloomFilter();
|
||||
return advancedBloomFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const advancedBloomFilter = (filter as unknown) as PIXI.filters.AdvancedBloomFilter;
|
||||
if (parameterName === 'threshold') {
|
||||
advancedBloomFilter.threshold = value;
|
||||
@@ -23,8 +27,16 @@ namespace gdjs {
|
||||
advancedBloomFilter.padding = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,19 +2,31 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Ascii',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const asciiFilter = new PIXI.filters.AsciiFilter();
|
||||
return asciiFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const asciiFilter = (filter as unknown) as PIXI.filters.AsciiFilter;
|
||||
if (parameterName === 'size') {
|
||||
asciiFilter.size = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Bevel',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const bevelFilter = new PIXI.filters.BevelFilter();
|
||||
return bevelFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter;
|
||||
if (parameterName === 'rotation') {
|
||||
bevelFilter.rotation = value;
|
||||
@@ -22,7 +26,11 @@ namespace gdjs {
|
||||
bevelFilter.shadowAlpha = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {
|
||||
const bevelFilter = (filter as unknown) as PIXI.filters.BevelFilter;
|
||||
if (parameterName === 'lightColor') {
|
||||
bevelFilter.lightColor = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(
|
||||
@@ -35,7 +43,11 @@ namespace gdjs {
|
||||
);
|
||||
}
|
||||
}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,21 +2,33 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'BlackAndWhite',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const colorMatrix = new PIXI.ColorMatrixFilter();
|
||||
colorMatrix.blackAndWhite(false);
|
||||
return colorMatrix;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const colorMatrix = (filter as unknown) as PIXI.ColorMatrixFilter;
|
||||
if (parameterName !== 'opacity') {
|
||||
return;
|
||||
}
|
||||
colorMatrix.alpha = gdjs.PixiFiltersTools.clampValue(value, 0, 1);
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'BlendingMode',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const blendingModeFilter = new PIXI.AlphaFilter();
|
||||
return blendingModeFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const blendingModeFilter = (filter as unknown) as PIXI.AlphaFilter;
|
||||
if (parameterName === 'alpha') {
|
||||
blendingModeFilter.alpha = value;
|
||||
@@ -15,8 +19,16 @@ namespace gdjs {
|
||||
blendingModeFilter.blendMode = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Blur',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const blur = new PIXI.BlurFilter();
|
||||
return blur;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
if (
|
||||
parameterName !== 'blur' &&
|
||||
parameterName !== 'quality' &&
|
||||
@@ -21,8 +25,16 @@ namespace gdjs {
|
||||
}
|
||||
filter[parameterName] = value;
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,13 +2,17 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Brightness',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const brightness = new PIXI.ColorMatrixFilter();
|
||||
brightness.brightness(1, false);
|
||||
return brightness;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const brightnessFilter = (filter as unknown) as PIXI.ColorMatrixFilter;
|
||||
if (parameterName !== 'brightness') {
|
||||
return;
|
||||
@@ -18,8 +22,16 @@ namespace gdjs {
|
||||
false
|
||||
);
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'BulgePinch',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const bulgePinchFilter = new PIXI.filters.BulgePinchFilter();
|
||||
return bulgePinchFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const bulgePinchFilter = (filter as unknown) as PIXI.filters.BulgePinchFilter;
|
||||
if (parameterName === 'centerX') {
|
||||
bulgePinchFilter.center[0] = value;
|
||||
@@ -23,8 +27,16 @@ namespace gdjs {
|
||||
);
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,7 +2,7 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'ColorMap',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const colorMapTexture = target
|
||||
.getRuntimeScene()
|
||||
.getGame()
|
||||
@@ -19,8 +19,12 @@ namespace gdjs {
|
||||
);
|
||||
return colorMapFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const colorMapFilter = (filter as unknown) as PIXI.filters.ColorMapFilter;
|
||||
if (parameterName === 'mix') {
|
||||
colorMapFilter.mix = gdjs.PixiFiltersTools.clampValue(
|
||||
@@ -30,8 +34,16 @@ namespace gdjs {
|
||||
);
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {
|
||||
const colorMapFilter = (filter as unknown) as PIXI.filters.ColorMapFilter;
|
||||
if (parameterName === 'nearest') {
|
||||
colorMapFilter.nearest = value;
|
||||
|
@@ -2,18 +2,26 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'ColorReplace',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const colorReplaceFilter = new PIXI.filters.ColorReplaceFilter();
|
||||
return colorReplaceFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter;
|
||||
if (parameterName === 'epsilon') {
|
||||
colorReplaceFilter.epsilon = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {
|
||||
const colorReplaceFilter = (filter as unknown) as PIXI.filters.ColorReplaceFilter;
|
||||
if (parameterName === 'originalColor') {
|
||||
colorReplaceFilter.originalColor = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(
|
||||
@@ -25,7 +33,11 @@ namespace gdjs {
|
||||
);
|
||||
}
|
||||
}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -9,7 +9,7 @@ namespace gdjs {
|
||||
crtFilter._animationTimer = 0;
|
||||
return crtFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
|
||||
if (filter.animationSpeed !== 0) {
|
||||
// Multiply by 10 so that the default value is a sensible speed
|
||||
filter.time +=
|
||||
@@ -23,7 +23,11 @@ namespace gdjs {
|
||||
}
|
||||
}
|
||||
}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
if (parameterName === 'lineWidth') {
|
||||
filter.lineWidth = value;
|
||||
} else if (parameterName === 'lineContrast') {
|
||||
@@ -48,8 +52,16 @@ namespace gdjs {
|
||||
filter.padding = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {
|
||||
if (parameterName === 'verticalLine') {
|
||||
filter.verticalLine = value;
|
||||
}
|
||||
|
@@ -2,7 +2,7 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Displacement',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const displacementMapTexture = target
|
||||
.getRuntimeScene()
|
||||
.getGame()
|
||||
@@ -15,8 +15,12 @@ namespace gdjs {
|
||||
);
|
||||
return displacementFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const displacementFilter = (filter as unknown) as PIXI.DisplacementFilter;
|
||||
if (parameterName === 'scaleX') {
|
||||
displacementFilter.scale.x = value;
|
||||
@@ -25,8 +29,16 @@ namespace gdjs {
|
||||
displacementFilter.scale.y = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Dot',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const dotFilter = new PIXI.filters.DotFilter();
|
||||
return dotFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const dotFilter = (filter as unknown) as PIXI.filters.DotFilter;
|
||||
if (parameterName === 'scale') {
|
||||
dotFilter.scale = value;
|
||||
@@ -15,8 +19,16 @@ namespace gdjs {
|
||||
dotFilter.angle = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'DropShadow',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const dropShadowFilter = new PIXI.filters.DropShadowFilter();
|
||||
return dropShadowFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const dropShadowFilter = (filter as unknown) as PIXI.filters.DropShadowFilter;
|
||||
if (parameterName === 'blur') {
|
||||
dropShadowFilter.blur = value;
|
||||
@@ -23,7 +27,11 @@ namespace gdjs {
|
||||
dropShadowFilter.padding = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {
|
||||
const dropShadowFilter = (filter as unknown) as PIXI.filters.DropShadowFilter;
|
||||
if (parameterName === 'color') {
|
||||
dropShadowFilter.color = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(
|
||||
@@ -31,7 +39,11 @@ namespace gdjs {
|
||||
);
|
||||
}
|
||||
}
|
||||
updateBooleanParameter(filter, parameterName, value) {
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {
|
||||
const dropShadowFilter = (filter as unknown) as PIXI.filters.DropShadowFilter;
|
||||
if (parameterName === 'shadowOnly') {
|
||||
dropShadowFilter.shadowOnly = value;
|
||||
|
@@ -9,7 +9,7 @@ namespace gdjs {
|
||||
glitchFilter._animationTimer = 0;
|
||||
return glitchFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
|
||||
if (filter.animationFrequency !== 0) {
|
||||
filter._animationTimer += target.getElapsedTime() / 1000;
|
||||
if (filter._animationTimer >= 1 / filter.animationFrequency) {
|
||||
@@ -18,7 +18,11 @@ namespace gdjs {
|
||||
}
|
||||
}
|
||||
}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
if (parameterName === 'slices') {
|
||||
filter.slices = value;
|
||||
} else if (parameterName === 'offset') {
|
||||
@@ -47,8 +51,16 @@ namespace gdjs {
|
||||
filter.animationFrequency = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {
|
||||
if (parameterName === 'average') {
|
||||
filter.average = value;
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Glow',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const glowFilter = new PIXI.filters.GlowFilter();
|
||||
return glowFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const glowFilter = (filter as unknown) as PIXI.filters.GlowFilter;
|
||||
if (parameterName === 'innerStrength') {
|
||||
glowFilter.innerStrength = value;
|
||||
@@ -18,13 +22,21 @@ namespace gdjs {
|
||||
glowFilter.distance = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {
|
||||
const glowFilter = (filter as unknown) as PIXI.filters.GlowFilter;
|
||||
if (parameterName === 'color') {
|
||||
glowFilter.color = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value);
|
||||
}
|
||||
}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -8,13 +8,17 @@ namespace gdjs {
|
||||
const godrayFilter = new PIXI.filters.GodrayFilter();
|
||||
return godrayFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
|
||||
if (filter.animationSpeed !== 0) {
|
||||
filter.time +=
|
||||
(target.getElapsedTime() / 1000) * filter.animationSpeed;
|
||||
}
|
||||
}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
if (parameterName === 'lacunarity') {
|
||||
filter.lacunarity = value;
|
||||
} else if (parameterName === 'angle') {
|
||||
@@ -33,8 +37,16 @@ namespace gdjs {
|
||||
filter.padding = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {
|
||||
if (parameterName === 'parallel') {
|
||||
filter.parallel = value;
|
||||
}
|
||||
|
43
Extensions/Effects/hsl-adjustment-pixi-filter.ts
Normal file
43
Extensions/Effects/hsl-adjustment-pixi-filter.ts
Normal file
@@ -0,0 +1,43 @@
|
||||
namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'HslAdjustment',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const hslAdjustmentFilter = new PIXI.filters.HslAdjustmentFilter();
|
||||
return hslAdjustmentFilter;
|
||||
}
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const hslAdjustmentFilter = filter as PIXI.filters.HslAdjustmentFilter;
|
||||
if (parameterName === 'hue') {
|
||||
hslAdjustmentFilter.hue = value;
|
||||
} else if (parameterName === 'saturation') {
|
||||
hslAdjustmentFilter.saturation = value;
|
||||
} else if (parameterName === 'lightness') {
|
||||
hslAdjustmentFilter.lightness = value;
|
||||
} else if (parameterName === 'alpha') {
|
||||
hslAdjustmentFilter.alpha = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {
|
||||
const hslAdjustmentFilter = filter as PIXI.filters.HslAdjustmentFilter;
|
||||
if (parameterName === 'colorize') {
|
||||
hslAdjustmentFilter.colorize = value;
|
||||
}
|
||||
}
|
||||
})()
|
||||
);
|
||||
}
|
@@ -2,27 +2,37 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'KawaseBlur',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const kawaseBlurFilter = new PIXI.filters.KawaseBlurFilter();
|
||||
return kawaseBlurFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const kawaseBlurFilter = (filter as unknown) as PIXI.filters.KawaseBlurFilter;
|
||||
if (parameterName === 'pixelizeX') {
|
||||
// @ts-ignore: fix these wrong parameters
|
||||
kawaseBlurFilter.pixelizeX = value;
|
||||
kawaseBlurFilter.pixelSize[0] = value;
|
||||
} else if (parameterName === 'pixelizeY') {
|
||||
// @ts-ignore: fix these wrong parameters
|
||||
kawaseBlurFilter.pixelizeY = value;
|
||||
kawaseBlurFilter.pixelSize[1] = value;
|
||||
} else if (parameterName === 'blur') {
|
||||
kawaseBlurFilter.blur = value;
|
||||
} else if (parameterName === 'quality') {
|
||||
kawaseBlurFilter.quality = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -24,19 +24,31 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'LightNight',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const filter = new gdjs.LightNightPixiFilter();
|
||||
return filter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
if (parameterName !== 'opacity') {
|
||||
return;
|
||||
}
|
||||
filter.uniforms.opacity = gdjs.PixiFiltersTools.clampValue(value, 0, 1);
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
40
Extensions/Effects/motion-blur-pixi-filter.ts
Normal file
40
Extensions/Effects/motion-blur-pixi-filter.ts
Normal file
@@ -0,0 +1,40 @@
|
||||
namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'MotionBlur',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const motionBlurFilter = new PIXI.filters.MotionBlurFilter([0, 0]);
|
||||
return motionBlurFilter;
|
||||
}
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const motionBlurFilter = filter as PIXI.filters.MotionBlurFilter;
|
||||
if (parameterName === 'velocityX') {
|
||||
// @ts-ignore Using the private member avoids to instantiate Arrays.
|
||||
motionBlurFilter._velocity.x = value;
|
||||
} else if (parameterName === 'velocityY') {
|
||||
// @ts-ignore Using the private member avoids to instantiate Arrays.
|
||||
motionBlurFilter._velocity.y = value;
|
||||
} else if (parameterName === 'kernelSize') {
|
||||
motionBlurFilter.kernelSize = value;
|
||||
} else if (parameterName === 'offset') {
|
||||
motionBlurFilter.offset = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
@@ -28,12 +28,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Night',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const filter = new gdjs.NightPixiFilter();
|
||||
return filter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
if (parameterName !== 'intensity' && parameterName !== 'opacity') {
|
||||
return;
|
||||
}
|
||||
@@ -43,8 +47,16 @@ namespace gdjs {
|
||||
1
|
||||
);
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,20 +2,32 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Noise',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const noiseFilter = new PIXI.NoiseFilter();
|
||||
return noiseFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const noiseFilter = (filter as unknown) as PIXI.NoiseFilter;
|
||||
if (parameterName !== 'noise') {
|
||||
return;
|
||||
}
|
||||
noiseFilter.noise = gdjs.PixiFiltersTools.clampValue(value, 0, 1);
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -9,7 +9,7 @@ namespace gdjs {
|
||||
oldFilmFilter._animationTimer = 0;
|
||||
return oldFilmFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
|
||||
if (filter.animationFrequency !== 0) {
|
||||
filter._animationTimer += target.getElapsedTime() / 1000;
|
||||
if (filter._animationTimer >= 1 / filter.animationFrequency) {
|
||||
@@ -18,7 +18,11 @@ namespace gdjs {
|
||||
}
|
||||
}
|
||||
}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
if (parameterName === 'sepia') {
|
||||
filter.sepia = value;
|
||||
} else if (parameterName === 'noise') {
|
||||
@@ -41,8 +45,16 @@ namespace gdjs {
|
||||
filter.animationFrequency = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Outline',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const outlineFilter = new PIXI.filters.OutlineFilter();
|
||||
return outlineFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const outlineFilter = (filter as unknown) as PIXI.filters.OutlineFilter;
|
||||
if (parameterName === 'thickness') {
|
||||
outlineFilter.thickness = value;
|
||||
@@ -15,7 +19,11 @@ namespace gdjs {
|
||||
outlineFilter.padding = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {
|
||||
const outlineFilter = (filter as unknown) as PIXI.filters.OutlineFilter;
|
||||
if (parameterName === 'color') {
|
||||
outlineFilter.color = gdjs.PixiFiltersTools.rgbOrHexToHexNumber(
|
||||
@@ -23,7 +31,11 @@ namespace gdjs {
|
||||
);
|
||||
}
|
||||
}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,21 +2,33 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Pixelate',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const pixelateFilter = new PIXI.filters.PixelateFilter(
|
||||
effectData.doubleParameters.size
|
||||
);
|
||||
return pixelateFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const pixelateFilter = (filter as unknown) as PIXI.filters.PixelateFilter;
|
||||
if (parameterName === 'size') {
|
||||
pixelateFilter.size = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -1,3 +1,4 @@
|
||||
// This filter is probably made useless by advanced-bloom.
|
||||
/*!
|
||||
* @pixi/filter-bloom - v5.1.1
|
||||
* Compiled Thu, 31 Aug 2023 09:18:38 UTC
|
||||
|
@@ -1,3 +1,5 @@
|
||||
// TODO This filter can be interesting to make a gradient shadow over sprites.
|
||||
// It can work with only 2 colors but maybe it would be better to wait that property list are handled.
|
||||
/*!
|
||||
* @pixi/filter-color-gradient - v5.2.0
|
||||
* Compiled Thu, 31 Aug 2023 09:18:38 UTC
|
||||
|
@@ -1,3 +1,4 @@
|
||||
// It doesn't seem very useful.
|
||||
/*!
|
||||
* @pixi/filter-color-overlay - v5.1.1
|
||||
* Compiled Thu, 31 Aug 2023 09:18:38 UTC
|
||||
|
@@ -1,3 +1,4 @@
|
||||
// It's probably too complicated to use.
|
||||
/*!
|
||||
* @pixi/filter-convolution - v5.1.1
|
||||
* Compiled Thu, 31 Aug 2023 09:18:38 UTC
|
||||
|
@@ -1,3 +1,4 @@
|
||||
// This filter is maybe too much specific.
|
||||
/*!
|
||||
* @pixi/filter-cross-hatch - v5.1.1
|
||||
* Compiled Thu, 31 Aug 2023 09:18:38 UTC
|
||||
|
@@ -1,3 +1,4 @@
|
||||
// It probably needs to be blend to be useful.
|
||||
/*!
|
||||
* @pixi/filter-emboss - v5.1.1
|
||||
* Compiled Thu, 31 Aug 2023 09:18:38 UTC
|
||||
|
@@ -1,3 +1,4 @@
|
||||
// There is already a black-and-white effect that has more features.
|
||||
/*!
|
||||
* @pixi/filter-grayscale - v5.1.1
|
||||
* Compiled Thu, 31 Aug 2023 09:18:38 UTC
|
||||
|
@@ -1,3 +1,4 @@
|
||||
// This filter doesn't seem useful and need property list.
|
||||
/*!
|
||||
* @pixi/filter-multi-color-replace - v5.1.1
|
||||
* Compiled Thu, 31 Aug 2023 09:18:38 UTC
|
||||
|
@@ -1,3 +1,4 @@
|
||||
// This filter is probably not very useful.
|
||||
/*!
|
||||
* @pixi/filter-simple-lightmap - v5.1.1
|
||||
* Compiled Thu, 31 Aug 2023 09:18:38 UTC
|
||||
|
63
Extensions/Effects/pixi-filters/types/HslAdjustmentFilter.d.ts
vendored
Normal file
63
Extensions/Effects/pixi-filters/types/HslAdjustmentFilter.d.ts
vendored
Normal file
@@ -0,0 +1,63 @@
|
||||
declare namespace PIXI.filters {
|
||||
export interface HslAdjustmentFilterOptions {
|
||||
hue: number;
|
||||
saturation: number;
|
||||
lightness: number;
|
||||
colorize: boolean;
|
||||
alpha: number;
|
||||
}
|
||||
/**
|
||||
* @class
|
||||
* @extends PIXI.Filter
|
||||
* @see {@link https://www.npmjs.com/package/@pixi/filter-hsl-adjustment|@pixi/filter-hsl-adjustment}
|
||||
* @see {@link https://www.npmjs.com/package/pixi-filters|pixi-filters}
|
||||
*/
|
||||
export class HslAdjustmentFilter extends PIXI.Filter {
|
||||
private _hue;
|
||||
/** Default values for options. */
|
||||
static readonly defaults: HslAdjustmentFilterOptions;
|
||||
/**
|
||||
* @param options - The optional parameters of the filter.
|
||||
* @param {number} [options.hue=0] - The amount of hue in degrees (-180 to 180)
|
||||
* @param {number} [options.saturation=0] - The amount of color saturation (-1 to 1)
|
||||
* @param {number} [options.lightness=0] - The amount of lightness (-1 to 1)
|
||||
* @param {boolean} [options.colorize=false] - Whether to colorize the image
|
||||
* @param {number} [options.alpha=1] - The amount of alpha (0 to 1)
|
||||
*/
|
||||
constructor(options?: Partial<HslAdjustmentFilterOptions>);
|
||||
/**
|
||||
* Hue (-180 to 180)
|
||||
* @default 0
|
||||
*/
|
||||
get hue(): number;
|
||||
set hue(value: number);
|
||||
/**
|
||||
* Alpha (0-1)
|
||||
* @default 1
|
||||
*/
|
||||
get alpha(): number;
|
||||
set alpha(value: number);
|
||||
/**
|
||||
* Colorize (render as a single color)
|
||||
* @default false
|
||||
*/
|
||||
get colorize(): boolean;
|
||||
set colorize(value: boolean);
|
||||
/**
|
||||
* Lightness (-1 to 1)
|
||||
* @default 0
|
||||
*/
|
||||
get lightness(): number;
|
||||
set lightness(value: number);
|
||||
/**
|
||||
* Saturation (-1 to 1)
|
||||
* @default 0
|
||||
*/
|
||||
get saturation(): number;
|
||||
set saturation(value: number);
|
||||
}
|
||||
}
|
||||
declare module '@pixi/filter-hsl-adjustment' {
|
||||
export import HslAdjustmentFilter = PIXI.filters.HslAdjustmentFilter;
|
||||
export import HslAdjustmentFilterOptions = PIXI.filters.HslAdjustmentFilterOptions;
|
||||
}
|
@@ -1,20 +1,84 @@
|
||||
declare namespace PIXI.filters {
|
||||
export type PointLike = PIXI.Point | number[];
|
||||
interface ShockwaveFilterOptions {
|
||||
amplitude: number;
|
||||
wavelength: number;
|
||||
speed: number;
|
||||
brightness: number;
|
||||
radius: number;
|
||||
}
|
||||
/**
|
||||
* The ShockwaveFilter class lets you apply a shockwave effect.<br>
|
||||
*
|
||||
* @class
|
||||
* @extends PIXI.Filter
|
||||
* @see {@link https://www.npmjs.com/package/@pixi/filter-shockwave|@pixi/filter-shockwave}
|
||||
* @see {@link https://www.npmjs.com/package/pixi-filters|pixi-filters}
|
||||
*/
|
||||
export class ShockwaveFilter extends PIXI.Filter {
|
||||
/** Default constructor options. */
|
||||
static readonly defaults: ShockwaveFilterOptions;
|
||||
/**
|
||||
* Sets the elapsed time of the shockwave.
|
||||
* It could control the current size of shockwave.
|
||||
*/
|
||||
time: number;
|
||||
/**
|
||||
* @param {PIXI.Point|number[]} [center=[0.5, 0.5]] - See `center` property.
|
||||
* @param {object} [options] - The optional parameters of shockwave filter.
|
||||
* @param {number} [options.amplitude=0.5] - See `amplitude`` property.
|
||||
* @param {number} [options.wavelength=1.0] - See `wavelength` property.
|
||||
* @param {number} [options.speed=500.0] - See `speed` property.
|
||||
* @param {number} [options.brightness=8] - See `brightness` property.
|
||||
* @param {number} [options.radius=4] - See `radius` property.
|
||||
* @param {number} [time=0] - See `time` property.
|
||||
*/
|
||||
constructor(
|
||||
center?: PIXI.Point | number[],
|
||||
options?: ShockwaveFilterOptions,
|
||||
center?: PointLike,
|
||||
options?: Partial<ShockwaveFilterOptions>,
|
||||
time?: number
|
||||
);
|
||||
center: PIXI.Point | number[];
|
||||
options: ShockwaveFilterOptions;
|
||||
time: number;
|
||||
}
|
||||
export interface ShockwaveFilterOptions {
|
||||
amplitude?: number;
|
||||
wavelength?: number;
|
||||
brightness?: number;
|
||||
speed?: number;
|
||||
radius?: number;
|
||||
apply(
|
||||
filterManager: PIXI.FilterSystem,
|
||||
input: PIXI.RenderTexture,
|
||||
output: PIXI.RenderTexture,
|
||||
clear: PIXI.CLEAR_MODES
|
||||
): void;
|
||||
/**
|
||||
* Sets the center of the shockwave in normalized screen coords. That is
|
||||
* (0,0) is the top-left and (1,1) is the bottom right.
|
||||
*
|
||||
* @member {PIXI.Point|number[]}
|
||||
*/
|
||||
get center(): PointLike;
|
||||
set center(value: PointLike);
|
||||
/**
|
||||
* The amplitude of the shockwave.
|
||||
*/
|
||||
get amplitude(): number;
|
||||
set amplitude(value: number);
|
||||
/**
|
||||
* The wavelength of the shockwave.
|
||||
*/
|
||||
get wavelength(): number;
|
||||
set wavelength(value: number);
|
||||
/**
|
||||
* The brightness of the shockwave.
|
||||
*/
|
||||
get brightness(): number;
|
||||
set brightness(value: number);
|
||||
/**
|
||||
* The speed about the shockwave ripples out.
|
||||
* The unit is `pixel/second`
|
||||
*/
|
||||
get speed(): number;
|
||||
set speed(value: number);
|
||||
/**
|
||||
* The maximum radius of shockwave.
|
||||
* `< 0.0` means it's infinity.
|
||||
*/
|
||||
get radius(): number;
|
||||
set radius(value: number);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -2,11 +2,11 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'RadialBlur',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const radialBlurFilter = new PIXI.filters.RadialBlurFilter();
|
||||
return radialBlurFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
|
||||
const radialBlurFilter = (filter as unknown) as PIXI.filters.RadialBlurFilter;
|
||||
radialBlurFilter.center[0] = Math.round(
|
||||
// @ts-ignore - extra properties are stored on the filter.
|
||||
@@ -17,7 +17,11 @@ namespace gdjs {
|
||||
radialBlurFilter._centerY * target.getHeight()
|
||||
);
|
||||
}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const radialBlurFilter = (filter as unknown) as PIXI.filters.RadialBlurFilter;
|
||||
if (parameterName === 'radius') {
|
||||
radialBlurFilter.radius = value < 0 ? -1 : value;
|
||||
@@ -39,8 +43,16 @@ namespace gdjs {
|
||||
radialBlurFilter.padding = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -25,13 +25,17 @@ namespace gdjs {
|
||||
);
|
||||
return reflectionFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
|
||||
if (filter.animationSpeed !== 0) {
|
||||
filter.time +=
|
||||
(target.getElapsedTime() / 1000) * filter.animationSpeed;
|
||||
}
|
||||
}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
if (parameterName === 'boundary') {
|
||||
filter.boundary = value;
|
||||
}
|
||||
@@ -57,8 +61,16 @@ namespace gdjs {
|
||||
filter.animationSpeed = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {
|
||||
if (parameterName === 'mirror') {
|
||||
filter.mirror = value;
|
||||
}
|
||||
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'RGBSplit',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const rgbSplitFilter = new PIXI.filters.RGBSplitFilter();
|
||||
return rgbSplitFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const rgbSplitFilter = (filter as unknown) as PIXI.filters.RGBSplitFilter;
|
||||
if (parameterName === 'redX') {
|
||||
rgbSplitFilter.red.x = value;
|
||||
@@ -23,8 +27,16 @@ namespace gdjs {
|
||||
rgbSplitFilter.blue.y = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,21 +2,33 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Sepia',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const colorMatrixFilter = new PIXI.ColorMatrixFilter();
|
||||
colorMatrixFilter.sepia(false);
|
||||
return colorMatrixFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const colorMatrixFilter = (filter as unknown) as PIXI.ColorMatrixFilter;
|
||||
if (parameterName !== 'opacity') {
|
||||
return;
|
||||
}
|
||||
colorMatrixFilter.alpha = gdjs.PixiFiltersTools.clampValue(value, 0, 1);
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
61
Extensions/Effects/shockwave-pixi-filter.ts
Normal file
61
Extensions/Effects/shockwave-pixi-filter.ts
Normal file
@@ -0,0 +1,61 @@
|
||||
namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Shockwave',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const shockwaveFilter = new PIXI.filters.ShockwaveFilter([0.5, 0.5]);
|
||||
return shockwaveFilter;
|
||||
}
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
|
||||
const shockwaveFilter = (filter as unknown) as PIXI.filters.ShockwaveFilter;
|
||||
if (shockwaveFilter.speed !== 0) {
|
||||
shockwaveFilter.time += target.getElapsedTime() / 1000;
|
||||
}
|
||||
shockwaveFilter.center[0] = Math.round(
|
||||
// @ts-ignore - extra properties are stored on the filter.
|
||||
shockwaveFilter._centerX * target.getWidth()
|
||||
);
|
||||
shockwaveFilter.center[1] = Math.round(
|
||||
// @ts-ignore - extra properties are stored on the filter.
|
||||
shockwaveFilter._centerY * target.getHeight()
|
||||
);
|
||||
}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const shockwaveFilter = filter as PIXI.filters.ShockwaveFilter;
|
||||
if (parameterName === 'centerX') {
|
||||
// @ts-ignore - extra properties are stored on the filter.
|
||||
shockwaveFilter._centerX = value;
|
||||
} else if (parameterName === 'centerY') {
|
||||
// @ts-ignore - extra properties are stored on the filter.
|
||||
shockwaveFilter._centerY = value;
|
||||
} else if (parameterName === 'time') {
|
||||
shockwaveFilter.time = value;
|
||||
} else if (parameterName === 'speed') {
|
||||
shockwaveFilter.speed = value;
|
||||
} else if (parameterName === 'amplitude') {
|
||||
shockwaveFilter.amplitude = value;
|
||||
} else if (parameterName === 'wavelength') {
|
||||
shockwaveFilter.wavelength = value;
|
||||
} else if (parameterName === 'brightness') {
|
||||
shockwaveFilter.brightness = value;
|
||||
} else if (parameterName === 'radius') {
|
||||
shockwaveFilter.radius = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
@@ -2,12 +2,16 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'TiltShift',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const tiltShiftFilter = new PIXI.filters.TiltShiftFilter();
|
||||
return tiltShiftFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {}
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const tiltShiftFilter = (filter as unknown) as PIXI.filters.TiltShiftFilter;
|
||||
if (parameterName === 'blur') {
|
||||
tiltShiftFilter.blur = value;
|
||||
@@ -15,8 +19,16 @@ namespace gdjs {
|
||||
tiltShiftFilter.gradientBlur = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,12 +2,12 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'Twist',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const twistFilter = new PIXI.filters.TwistFilter();
|
||||
twistFilter.offset = new PIXI.Point(0, 0);
|
||||
return twistFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
|
||||
const twistFilter = (filter as unknown) as PIXI.filters.TwistFilter;
|
||||
twistFilter.offset.x = Math.round(
|
||||
// @ts-ignore - extra properties are stored on the filter.
|
||||
@@ -18,7 +18,11 @@ namespace gdjs {
|
||||
twistFilter._offsetY * target.getHeight()
|
||||
);
|
||||
}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const twistFilter = (filter as unknown) as PIXI.filters.TwistFilter;
|
||||
if (parameterName === 'radius') {
|
||||
twistFilter.radius = value;
|
||||
@@ -34,8 +38,16 @@ namespace gdjs {
|
||||
twistFilter._offsetY = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -2,11 +2,11 @@ namespace gdjs {
|
||||
gdjs.PixiFiltersTools.registerFilterCreator(
|
||||
'ZoomBlur',
|
||||
new (class extends gdjs.PixiFiltersTools.PixiFilterCreator {
|
||||
makePIXIFilter(target, effectData) {
|
||||
makePIXIFilter(target: EffectsTarget, effectData) {
|
||||
const zoomBlurFilter = new PIXI.filters.ZoomBlurFilter();
|
||||
return zoomBlurFilter;
|
||||
}
|
||||
updatePreRender(filter, target) {
|
||||
updatePreRender(filter: PIXI.Filter, target: EffectsTarget) {
|
||||
const zoomBlurFilter = (filter as unknown) as PIXI.filters.ZoomBlurFilter;
|
||||
zoomBlurFilter.center[0] = Math.round(
|
||||
// @ts-ignore - extra properties are stored on the filter.
|
||||
@@ -17,7 +17,11 @@ namespace gdjs {
|
||||
zoomBlurFilter._centerY * target.getHeight()
|
||||
);
|
||||
}
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
const zoomBlurFilter = (filter as unknown) as PIXI.filters.ZoomBlurFilter;
|
||||
if (parameterName === 'centerX') {
|
||||
// @ts-ignore - extra properties are stored on the filter.
|
||||
@@ -37,8 +41,16 @@ namespace gdjs {
|
||||
zoomBlurFilter.padding = value;
|
||||
}
|
||||
}
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -497,89 +497,84 @@ module.exports = {
|
||||
|
||||
/**
|
||||
* Renderer for instances of DummyObject inside the IDE.
|
||||
*
|
||||
* @extends RenderedInstance
|
||||
* @class RenderedDummyObjectInstance
|
||||
* @constructor
|
||||
*/
|
||||
function RenderedDummyObjectInstance(
|
||||
project,
|
||||
layout,
|
||||
instance,
|
||||
associatedObjectConfiguration,
|
||||
pixiContainer,
|
||||
pixiResourcesLoader
|
||||
) {
|
||||
RenderedInstance.call(
|
||||
this,
|
||||
class RenderedDummyObjectInstance extends RenderedInstance {
|
||||
constructor(
|
||||
project,
|
||||
layout,
|
||||
instance,
|
||||
associatedObjectConfiguration,
|
||||
pixiContainer,
|
||||
pixiResourcesLoader
|
||||
);
|
||||
) {
|
||||
super(
|
||||
project,
|
||||
layout,
|
||||
instance,
|
||||
associatedObjectConfiguration,
|
||||
pixiContainer,
|
||||
pixiResourcesLoader
|
||||
);
|
||||
|
||||
//Setup the PIXI object:
|
||||
this._pixiObject = new PIXI.Text('This is a dummy object', {
|
||||
align: 'left',
|
||||
});
|
||||
this._pixiObject.anchor.x = 0.5;
|
||||
this._pixiObject.anchor.y = 0.5;
|
||||
this._pixiContainer.addChild(this._pixiObject);
|
||||
this.update();
|
||||
//Setup the PIXI object:
|
||||
this._pixiObject = new PIXI.Text('This is a dummy object', {
|
||||
align: 'left',
|
||||
});
|
||||
this._pixiObject.anchor.x = 0.5;
|
||||
this._pixiObject.anchor.y = 0.5;
|
||||
this._pixiContainer.addChild(this._pixiObject);
|
||||
this.update();
|
||||
}
|
||||
|
||||
onRemovedFromScene() {
|
||||
super.onRemovedFromScene();
|
||||
this._pixiObject.destroy(true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the path to the thumbnail of the specified object.
|
||||
*/
|
||||
static getThumbnail(project, resourcesLoader, objectConfiguration) {
|
||||
return 'CppPlatform/Extensions/texticon24.png';
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called to update the PIXI object on the scene editor
|
||||
*/
|
||||
update() {
|
||||
// Read a property from the object
|
||||
const property1Value = this._associatedObjectConfiguration
|
||||
.getProperties()
|
||||
.get('My first property')
|
||||
.getValue();
|
||||
this._pixiObject.text = property1Value;
|
||||
|
||||
// Read position and angle from the instance
|
||||
this._pixiObject.position.x =
|
||||
this._instance.getX() + this._pixiObject.width / 2;
|
||||
this._pixiObject.position.y =
|
||||
this._instance.getY() + this._pixiObject.height / 2;
|
||||
this._pixiObject.rotation = RenderedInstance.toRad(
|
||||
this._instance.getAngle()
|
||||
);
|
||||
// Custom size can be read in this.getCustomWidth() and
|
||||
// this.getCustomHeight()
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the width of the instance, when it's not resized.
|
||||
*/
|
||||
getDefaultWidth() {
|
||||
return this._pixiObject.width;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the height of the instance, when it's not resized.
|
||||
*/
|
||||
getDefaultHeight() {
|
||||
return this._pixiObject.height;
|
||||
}
|
||||
}
|
||||
RenderedDummyObjectInstance.prototype = Object.create(
|
||||
RenderedInstance.prototype
|
||||
);
|
||||
|
||||
/**
|
||||
* Return the path to the thumbnail of the specified object.
|
||||
*/
|
||||
RenderedDummyObjectInstance.getThumbnail = function (
|
||||
project,
|
||||
resourcesLoader,
|
||||
objectConfiguration
|
||||
) {
|
||||
return 'CppPlatform/Extensions/texticon24.png';
|
||||
};
|
||||
|
||||
/**
|
||||
* This is called to update the PIXI object on the scene editor
|
||||
*/
|
||||
RenderedDummyObjectInstance.prototype.update = function () {
|
||||
// Read a property from the object
|
||||
const property1Value = this._associatedObjectConfiguration
|
||||
.getProperties()
|
||||
.get('My first property')
|
||||
.getValue();
|
||||
this._pixiObject.text = property1Value;
|
||||
|
||||
// Read position and angle from the instance
|
||||
this._pixiObject.position.x =
|
||||
this._instance.getX() + this._pixiObject.width / 2;
|
||||
this._pixiObject.position.y =
|
||||
this._instance.getY() + this._pixiObject.height / 2;
|
||||
this._pixiObject.rotation = RenderedInstance.toRad(
|
||||
this._instance.getAngle()
|
||||
);
|
||||
// Custom size can be read in this.getCustomWidth() and
|
||||
// this.getCustomHeight()
|
||||
};
|
||||
|
||||
/**
|
||||
* Return the width of the instance, when it's not resized.
|
||||
*/
|
||||
RenderedDummyObjectInstance.prototype.getDefaultWidth = function () {
|
||||
return this._pixiObject.width;
|
||||
};
|
||||
|
||||
/**
|
||||
* Return the height of the instance, when it's not resized.
|
||||
*/
|
||||
RenderedDummyObjectInstance.prototype.getDefaultHeight = function () {
|
||||
return this._pixiObject.height;
|
||||
};
|
||||
|
||||
objectsRenderingService.registerInstanceRenderer(
|
||||
'MyDummyExtension::DummyObject',
|
||||
|
@@ -66,7 +66,11 @@ namespace gdjs {
|
||||
// You can update the uniforms or other state of the filter.
|
||||
}
|
||||
// Function that will be called to update a (number) parameter of the PIXI filter with a new value
|
||||
updateDoubleParameter(filter, parameterName, value) {
|
||||
updateDoubleParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: number
|
||||
) {
|
||||
if (parameterName === 'opacity') {
|
||||
filter.uniforms.opacity = gdjs.PixiFiltersTools.clampValue(
|
||||
value,
|
||||
@@ -76,9 +80,17 @@ namespace gdjs {
|
||||
}
|
||||
}
|
||||
// Function that will be called to update a (string) parameter of the PIXI filter with a new value
|
||||
updateStringParameter(filter, parameterName, value) {}
|
||||
updateStringParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: string
|
||||
) {}
|
||||
// Function that will be called to update a (boolean) parameter of the PIXI filter with a new value
|
||||
updateBooleanParameter(filter, parameterName, value) {}
|
||||
updateBooleanParameter(
|
||||
filter: PIXI.Filter,
|
||||
parameterName: string,
|
||||
value: boolean
|
||||
) {}
|
||||
})()
|
||||
);
|
||||
}
|
||||
|
@@ -26,6 +26,7 @@ export type ObjectsRenderingService = {
|
||||
requireModule: (dirname: string, moduleName: string) => any,
|
||||
getThumbnail: (project: gdProject, objectConfiguration: gdObjectConfiguration) => string,
|
||||
rgbOrHexToHexNumber: (value: string) => number,
|
||||
registerClearCache: (clearCache: any => void) => void,
|
||||
};
|
||||
export type ObjectsEditorService = {
|
||||
registerEditorConfiguration: (objectType: string, editorConfiguration: any) => void,
|
||||
|
@@ -263,107 +263,107 @@ module.exports = {
|
||||
|
||||
/**
|
||||
* Renderer for instances of LightObject inside the IDE.
|
||||
*
|
||||
* @extends RenderedInstance
|
||||
* @class RenderedLightObjectInstance
|
||||
* @constructor
|
||||
*/
|
||||
function RenderedLightObjectInstance(
|
||||
project,
|
||||
layout,
|
||||
instance,
|
||||
associatedObjectConfiguration,
|
||||
pixiContainer,
|
||||
pixiResourcesLoader
|
||||
) {
|
||||
RenderedInstance.call(
|
||||
this,
|
||||
class RenderedLightObjectInstance extends RenderedInstance {
|
||||
constructor(
|
||||
project,
|
||||
layout,
|
||||
instance,
|
||||
associatedObjectConfiguration,
|
||||
pixiContainer,
|
||||
pixiResourcesLoader
|
||||
);
|
||||
this._radius = parseFloat(
|
||||
this._associatedObjectConfiguration
|
||||
.getProperties(this.project)
|
||||
.get('radius')
|
||||
.getValue()
|
||||
);
|
||||
if (this._radius <= 0) this._radius = 1;
|
||||
const color = objectsRenderingService.rgbOrHexToHexNumber(
|
||||
this._associatedObjectConfiguration
|
||||
.getProperties(this.project)
|
||||
.get('color')
|
||||
.getValue()
|
||||
);
|
||||
) {
|
||||
super(
|
||||
project,
|
||||
layout,
|
||||
instance,
|
||||
associatedObjectConfiguration,
|
||||
pixiContainer,
|
||||
pixiResourcesLoader
|
||||
);
|
||||
this._radius = parseFloat(
|
||||
this._associatedObjectConfiguration
|
||||
.getProperties(this.project)
|
||||
.get('radius')
|
||||
.getValue()
|
||||
);
|
||||
if (this._radius <= 0) this._radius = 1;
|
||||
const color = objectsRenderingService.rgbOrHexToHexNumber(
|
||||
this._associatedObjectConfiguration
|
||||
.getProperties(this.project)
|
||||
.get('color')
|
||||
.getValue()
|
||||
);
|
||||
|
||||
// The icon in the middle.
|
||||
const lightIconSprite = new PIXI.Sprite(PIXI.Texture.from('CppPlatform/Extensions/lightIcon32.png'));
|
||||
lightIconSprite.anchor.x = 0.5;
|
||||
lightIconSprite.anchor.y = 0.5;
|
||||
// The icon in the middle.
|
||||
const lightIconSprite = new PIXI.Sprite(PIXI.Texture.from('CppPlatform/Extensions/lightIcon32.png'));
|
||||
lightIconSprite.anchor.x = 0.5;
|
||||
lightIconSprite.anchor.y = 0.5;
|
||||
|
||||
// The circle to show the radius of the light.
|
||||
const radiusBorderWidth = 2;
|
||||
const radiusGraphics = new PIXI.Graphics();
|
||||
radiusGraphics.lineStyle(
|
||||
radiusBorderWidth,
|
||||
color,
|
||||
0.8
|
||||
);
|
||||
radiusGraphics.drawCircle(0, 0, Math.max(1, this._radius - radiusBorderWidth));
|
||||
// The circle to show the radius of the light.
|
||||
const radiusBorderWidth = 2;
|
||||
const radiusGraphics = new PIXI.Graphics();
|
||||
radiusGraphics.lineStyle(
|
||||
radiusBorderWidth,
|
||||
color,
|
||||
0.8
|
||||
);
|
||||
radiusGraphics.drawCircle(0, 0, Math.max(1, this._radius - radiusBorderWidth));
|
||||
|
||||
this._pixiObject = new PIXI.Container();
|
||||
this._pixiObject.addChild(lightIconSprite);
|
||||
this._pixiObject.addChild(radiusGraphics);
|
||||
this._pixiContainer.addChild(this._pixiObject);
|
||||
this.update();
|
||||
this._pixiObject = new PIXI.Container();
|
||||
this._pixiObject.addChild(lightIconSprite);
|
||||
this._pixiObject.addChild(radiusGraphics);
|
||||
this._pixiContainer.addChild(this._pixiObject);
|
||||
this.update();
|
||||
}
|
||||
|
||||
onRemovedFromScene() {
|
||||
super.onRemovedFromScene();
|
||||
// Keep textures because they are shared by all sprites.
|
||||
this._pixiObject.destroy({ children: true });
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the path to the thumbnail of the specified object.
|
||||
*/
|
||||
static getThumbnail(
|
||||
project,
|
||||
resourcesLoader,
|
||||
objectConfiguration
|
||||
) {
|
||||
return 'CppPlatform/Extensions/lightIcon32.png';
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called to update the PIXI object on the scene editor
|
||||
*/
|
||||
update() {
|
||||
this._pixiObject.position.x = this._instance.getX();
|
||||
this._pixiObject.position.y = this._instance.getY();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the width of the instance, when it's not resized.
|
||||
*/
|
||||
getDefaultWidth() {
|
||||
return this._radius * 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the height of the instance, when it's not resized.
|
||||
*/
|
||||
getDefaultHeight() {
|
||||
return this._radius * 2;
|
||||
}
|
||||
|
||||
getOriginX() {
|
||||
return this._radius;
|
||||
}
|
||||
|
||||
getOriginY() {
|
||||
return this._radius;
|
||||
}
|
||||
}
|
||||
RenderedLightObjectInstance.prototype = Object.create(
|
||||
RenderedInstance.prototype
|
||||
);
|
||||
|
||||
/**
|
||||
* Return the path to the thumbnail of the specified object.
|
||||
*/
|
||||
RenderedLightObjectInstance.getThumbnail = function (
|
||||
project,
|
||||
resourcesLoader,
|
||||
objectConfiguration
|
||||
) {
|
||||
return 'CppPlatform/Extensions/lightIcon32.png';
|
||||
};
|
||||
|
||||
/**
|
||||
* This is called to update the PIXI object on the scene editor
|
||||
*/
|
||||
RenderedLightObjectInstance.prototype.update = function () {
|
||||
this._pixiObject.position.x = this._instance.getX();
|
||||
this._pixiObject.position.y = this._instance.getY();
|
||||
};
|
||||
|
||||
/**
|
||||
* Return the width of the instance, when it's not resized.
|
||||
*/
|
||||
RenderedLightObjectInstance.prototype.getDefaultWidth = function () {
|
||||
return this._radius * 2;
|
||||
};
|
||||
|
||||
/**
|
||||
* Return the height of the instance, when it's not resized.
|
||||
*/
|
||||
RenderedLightObjectInstance.prototype.getDefaultHeight = function () {
|
||||
return this._radius * 2;
|
||||
};
|
||||
|
||||
RenderedLightObjectInstance.prototype.getOriginX = function () {
|
||||
return this._radius;
|
||||
};
|
||||
|
||||
RenderedLightObjectInstance.prototype.getOriginY = function () {
|
||||
return this._radius;
|
||||
};
|
||||
|
||||
objectsRenderingService.registerInstanceRenderer(
|
||||
'Lighting::LightObject',
|
||||
|
@@ -34,7 +34,7 @@ void DeclareLinkedObjectsExtension(gd::PlatformExtension& extension) {
|
||||
_("Link two objects together, so as to be able to get one "
|
||||
"from the other."),
|
||||
_("Link _PARAM1_ and _PARAM2_"),
|
||||
"",
|
||||
_("Objects"),
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png",
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png")
|
||||
|
||||
@@ -49,7 +49,7 @@ void DeclareLinkedObjectsExtension(gd::PlatformExtension& extension) {
|
||||
_("Unlink two objects"),
|
||||
_("Unlink two objects."),
|
||||
_("Unlink _PARAM1_ and _PARAM2_"),
|
||||
"",
|
||||
_("Objects"),
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png",
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png")
|
||||
|
||||
@@ -64,7 +64,7 @@ void DeclareLinkedObjectsExtension(gd::PlatformExtension& extension) {
|
||||
_("Unlink all objects from an object"),
|
||||
_("Unlink all objects from an object."),
|
||||
_("Unlink all objects from _PARAM1_"),
|
||||
"",
|
||||
_("Objects"),
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png",
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png")
|
||||
|
||||
@@ -80,7 +80,7 @@ void DeclareLinkedObjectsExtension(gd::PlatformExtension& extension) {
|
||||
"next conditions and actions.\nThe condition will return "
|
||||
"false if no object was taken into account."),
|
||||
_("Take into account all \"_PARAM1_\" linked to _PARAM2_"),
|
||||
"",
|
||||
_("Objects"),
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png",
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png")
|
||||
|
||||
@@ -97,7 +97,7 @@ void DeclareLinkedObjectsExtension(gd::PlatformExtension& extension) {
|
||||
_("Take into account linked objects"),
|
||||
_("Take objects linked to the object into account for next actions."),
|
||||
_("Take into account all \"_PARAM1_\" linked to _PARAM2_"),
|
||||
"",
|
||||
_("Objects"),
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png",
|
||||
"CppPlatform/Extensions/LinkedObjectsicon24.png")
|
||||
|
||||
|
@@ -95,6 +95,10 @@ namespace gdjs {
|
||||
// in Pixi will create a flicker when cacheAsBitmap is set to true.
|
||||
// (see https://github.com/pixijs/pixijs/issues/4610)
|
||||
this._wrapperContainer.alpha = this._object.opacity / 255;
|
||||
// When the opacity is updated, the cache must be invalidated, otherwise
|
||||
// there is a risk of the panel sprite has been cached previously with a
|
||||
// different opacity (and cannot be updated anymore).
|
||||
this._spritesContainer.cacheAsBitmap = false;
|
||||
}
|
||||
|
||||
updateAngle(): void {
|
||||
@@ -389,6 +393,18 @@ namespace gdjs {
|
||||
getTextureHeight() {
|
||||
return this._textureHeight;
|
||||
}
|
||||
|
||||
destroy() {
|
||||
// Destroy textures because they are instantiated by this class.
|
||||
for (const borderSprite of this._borderSprites) {
|
||||
borderSprite.destroy({ texture: true });
|
||||
}
|
||||
this._centerSprite.destroy({ texture: true });
|
||||
// Destroy the containers without handling children because they are
|
||||
// already handled above.
|
||||
this._wrapperContainer.destroy(false);
|
||||
this._spritesContainer.destroy(false);
|
||||
}
|
||||
}
|
||||
|
||||
export const PanelSpriteRuntimeObjectRenderer = PanelSpriteRuntimeObjectPixiRenderer;
|
||||
|
@@ -114,13 +114,9 @@ namespace gdjs {
|
||||
return this._renderer.getRendererObject();
|
||||
}
|
||||
|
||||
onDestroyFromScene(instanceContainer: gdjs.RuntimeInstanceContainer): void {
|
||||
super.onDestroyFromScene(instanceContainer);
|
||||
// @ts-ignore
|
||||
if (this._renderer.onDestroy) {
|
||||
// @ts-ignore
|
||||
this._renderer.onDestroy();
|
||||
}
|
||||
onDestroyed(): void {
|
||||
super.onDestroyed();
|
||||
this._renderer.destroy();
|
||||
}
|
||||
|
||||
update(instanceContainer: gdjs.RuntimeInstanceContainer): void {
|
||||
|
@@ -119,11 +119,14 @@ namespace gdjs {
|
||||
},
|
||||
minStart: objectData.emitterForceMin,
|
||||
maxStart: objectData.emitterForceMax,
|
||||
// See _updateRotateFlagFromSpeed
|
||||
rotate:
|
||||
(objectData.particleGravityX !== 0 ||
|
||||
objectData.particleGravityY !== 0) &&
|
||||
objectData.particleAngle1 === 0 &&
|
||||
objectData.particleAngle2 === 0,
|
||||
objectData.particleAngle2 === 0 &&
|
||||
(objectData.particleGravityX !== 0 ||
|
||||
objectData.particleGravityY !== 0 ||
|
||||
objectData.emitterForceMin < 0 ||
|
||||
objectData.emitterForceMax < 0),
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -277,7 +280,7 @@ namespace gdjs {
|
||||
const behavior: any = this.emitter.getBehavior('moveAcceleration');
|
||||
behavior.accel.x = x;
|
||||
behavior.accel.y = y;
|
||||
this._updateRotateFromSpeedFlag();
|
||||
this._updateRotateFlagFromSpeed();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -285,15 +288,21 @@ namespace gdjs {
|
||||
* according to the speed direction. This is overriding the particle
|
||||
* rotation calculated by from `rotation`.
|
||||
*/
|
||||
private _updateRotateFromSpeedFlag() {
|
||||
private _updateRotateFlagFromSpeed() {
|
||||
const rotation: any = this.emitter.getBehavior('rotation');
|
||||
const moveAcceleration: any = this.emitter.getBehavior(
|
||||
'moveAcceleration'
|
||||
);
|
||||
moveAcceleration.rotate =
|
||||
(moveAcceleration.accel.x !== 0 || moveAcceleration.accel.y !== 0) &&
|
||||
rotation.minSpeed === 0 &&
|
||||
rotation.maxSpeed === 0;
|
||||
rotation.maxSpeed === 0 &&
|
||||
// This part is to avoid to do `atan` every frame when the object
|
||||
// direction doesn't change.
|
||||
(moveAcceleration.accel.x !== 0 ||
|
||||
moveAcceleration.accel.y !== 0 ||
|
||||
// Negative speeds need a 180° rotation.
|
||||
moveAcceleration.minStart < 0 ||
|
||||
moveAcceleration.maxStart < 0);
|
||||
}
|
||||
|
||||
setColor(
|
||||
@@ -334,7 +343,7 @@ namespace gdjs {
|
||||
const behavior: any = this.emitter.getBehavior('rotation');
|
||||
behavior.minSpeed = gdjs.toRad(min);
|
||||
behavior.maxSpeed = gdjs.toRad(max);
|
||||
this._updateRotateFromSpeedFlag();
|
||||
this._updateRotateFlagFromSpeed();
|
||||
}
|
||||
|
||||
setMaxParticlesCount(count: float): void {
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user