Skip to content

Commit

Permalink
Added new condition to check the zoom of a camera of a layer (#6747)
Browse files Browse the repository at this point in the history
  • Loading branch information
tristanbob authored Jul 4, 2024
1 parent f628119 commit 8c88038
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
19 changes: 19 additions & 0 deletions Core/GDCore/Extensions/Builtin/CameraExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,25 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
.AddParameter("expression", _("Camera number (default : 0)"), "", true)
.SetDefaultValue("0");

extension
.AddCondition(
"CameraZoom",
_("Camera zoom"),
_("Compare the zoom of a camera of a layer."),
_("Zoom of camera _PARAM2_ of layer _PARAM1_"),
"",
"res/conditions/camera24.png",
"res/conditions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "", true)
.SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "", true)
.SetDefaultValue("0")
.UseStandardRelationalOperatorParameters(
"number", gd::ParameterOptions::MakeNewOptions().SetDescription(
_("Zoom")))
.MarkAsAdvanced();

extension
.AddAction(
"FixCamera",
Expand Down
2 changes: 2 additions & 0 deletions GDJS/GDJS/Extensions/Builtin/CameraExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ CameraExtension::CameraExtension() {
.SetGetter("gdjs.evtTools.camera.getCameraRotation");
GetAllActions()["ZoomCamera"].SetFunctionName(
"gdjs.evtTools.camera.setCameraZoom");
GetAllConditions()["CameraZoom"].SetFunctionName(
"gdjs.evtTools.camera.getCameraZoom");

GetAllExpressions()["CameraX"].SetFunctionName(
"gdjs.evtTools.camera.getCameraX"); // Deprecated
Expand Down

0 comments on commit 8c88038

Please sign in to comment.