Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add actions to tween effect properties #5993

Merged
merged 13 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
#include "ExpressionMetadata.h"
#include "GDCore/CommonTools.h"
#include "GDCore/Extensions/PlatformExtension.h"
#include "GDCore/String.h"

namespace gd {
Expand Down Expand Up @@ -46,16 +47,14 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
// For objects/behavior, the supplementary information
// parameter is an object/behavior type...
((gd::ParameterMetadata::IsObject(type) ||
gd::ParameterMetadata::IsBehavior(type))
// Prefix with the namespace if it's not already there.
&& !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
? (supplementaryInformation.empty()
? ""
: extensionNamespace +
supplementaryInformation //... so prefix it with the extension
// namespace.
)
: supplementaryInformation); // Otherwise don't change anything
gd::ParameterMetadata::IsBehavior(type))
// Prefix with the namespace if it's not already there.
&& (supplementaryInformation.find(
PlatformExtension::GetNamespaceSeparator()) != gd::String::npos)
? supplementaryInformation
: (supplementaryInformation.empty()
? ""
: extensionNamespace + supplementaryInformation)));

// TODO: Assert against supplementaryInformation === "emsc" (when running with
// Emscripten), and warn about a missing argument when calling addParameter.
Expand Down
20 changes: 9 additions & 11 deletions Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <algorithm>

#include "GDCore/CommonTools.h"
#include "GDCore/Extensions/PlatformExtension.h"
#include "GDCore/Serialization/SerializerElement.h"
#include "GDCore/Tools/Localization.h"
#include "GDCore/Tools/Log.h"
Expand Down Expand Up @@ -64,17 +65,14 @@ InstructionMetadata& InstructionMetadata::AddParameter(
// For objects/behavior, the supplementary information
// parameter is an object/behavior type...
((gd::ParameterMetadata::IsObject(type) ||
gd::ParameterMetadata::IsBehavior(type))
// Prefix with the namespace if it's not already there.
&& !(supplementaryInformation.rfind(extensionNamespace, 0) == 0))
? (supplementaryInformation.empty()
? ""
: extensionNamespace +
supplementaryInformation //... so prefix it with the
// extension
// namespace.
)
: supplementaryInformation); // Otherwise don't change anything
gd::ParameterMetadata::IsBehavior(type))
// Prefix with the namespace if it's not already there.
&& (supplementaryInformation.find(
PlatformExtension::GetNamespaceSeparator()) != gd::String::npos)
? supplementaryInformation
: (supplementaryInformation.empty()
? ""
: extensionNamespace + supplementaryInformation)));

// TODO: Assert against supplementaryInformation === "emsc" (when running with
// Emscripten), and warn about a missing argument when calling addParameter.
Expand Down
4 changes: 4 additions & 0 deletions Core/GDCore/Extensions/PlatformExtension.h
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,11 @@ class GD_CORE_API PlatformExtension {
*
* \param name The name of the behavior
* \param fullname The user friendly name of the behavior
* \param defaultName The default name of behavior instances
* \param description The user friendly description of the behavior
* \param group The behavior category label
* \param icon The icon of the behavior.
* \param className The name of the class implementing the behavior
* \param instance An instance of the behavior that
* will be used to create the behavior
* \param sharedDatasInstance Optional
Expand All @@ -288,6 +291,7 @@ class GD_CORE_API PlatformExtension {
* \param name The name of the behavior
* \param fullname The user friendly name of the behavior
* \param description The user friendly description of the behavior
* \param group The behavior category label
* \param icon The icon of the behavior.
*/
gd::BehaviorMetadata& AddEventsBasedBehavior(
Expand Down
19 changes: 18 additions & 1 deletion Extensions/3D/AmbientLight.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,30 @@ namespace gdjs {
this.light.intensity = value;
}
}
getDoubleParameter(parameterName: string): number {
if (parameterName === 'intensity') {
return this.light.intensity;
}
return 0;
}
updateStringParameter(parameterName: string, value: string): void {
if (parameterName === 'color') {
AlexandreSi marked this conversation as resolved.
Show resolved Hide resolved
this.light.color = new THREE.Color(
this.light.color.setHex(
gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value)
);
}
}
updateColorParameter(parameterName: string, value: number): void {
if (parameterName === 'color') {
this.light.color.setHex(value);
}
}
getColorParameter(parameterName: string): number {
if (parameterName === 'color') {
return this.light.color.getHex();
}
return 0;
}
updateBooleanParameter(parameterName: string, value: boolean): void {}
})();
}
Expand Down
21 changes: 21 additions & 0 deletions Extensions/3D/DirectionalLight.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ namespace gdjs {
this.updateRotation();
}
}
getDoubleParameter(parameterName: string): number {
if (parameterName === 'intensity') {
return this.light.intensity;
} else if (parameterName === 'elevation') {
return this.elevation;
} else if (parameterName === 'rotation') {
return this.rotation;
AlexandreSi marked this conversation as resolved.
Show resolved Hide resolved
}
return 0;
}
updateStringParameter(parameterName: string, value: string): void {
if (parameterName === 'color') {
this.light.color = new THREE.Color(
Expand All @@ -85,6 +95,17 @@ namespace gdjs {
this.updateRotation();
}
}
updateColorParameter(parameterName: string, value: number): void {
if (parameterName === 'color') {
this.light.color.setHex(value);
}
}
getColorParameter(parameterName: string): number {
if (parameterName === 'color') {
return this.light.color.getHex();
}
return 0;
}
updateBooleanParameter(parameterName: string, value: boolean): void {}
updateRotation() {
if (this.top === 'Z+') {
Expand Down
17 changes: 17 additions & 0 deletions Extensions/3D/ExponentialFog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,30 @@ namespace gdjs {
this.fog.density = value;
}
}
getDoubleParameter(parameterName: string): number {
if (parameterName === 'density') {
return this.fog.density;
}
return 0;
}
updateStringParameter(parameterName: string, value: string): void {
if (parameterName === 'color') {
this.fog.color = new THREE.Color(
gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value)
);
}
}
updateColorParameter(parameterName: string, value: number): void {
if (parameterName === 'color') {
this.fog.color.setHex(value);
}
}
getColorParameter(parameterName: string): number {
if (parameterName === 'color') {
return this.fog.color.getHex();
}
return 0;
}
updateBooleanParameter(parameterName: string, value: boolean): void {}
})();
}
Expand Down
27 changes: 27 additions & 0 deletions Extensions/3D/HemisphereLight.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ namespace gdjs {
this.updateRotation();
}
}
getDoubleParameter(parameterName: string): number {
if (parameterName === 'intensity') {
return this.light.intensity;
} else if (parameterName === 'elevation') {
return this.elevation;
} else if (parameterName === 'rotation') {
return this.rotation;
AlexandreSi marked this conversation as resolved.
Show resolved Hide resolved
}
return 0;
}
updateStringParameter(parameterName: string, value: string): void {
if (parameterName === 'skyColor') {
this.light.color = new THREE.Color(
Expand All @@ -90,6 +100,23 @@ namespace gdjs {
this.updateRotation();
}
}
updateColorParameter(parameterName: string, value: number): void {
if (parameterName === 'skyColor') {
this.light.color.setHex(value);
}
if (parameterName === 'groundColor') {
this.light.groundColor.setHex(value);
}
}
getColorParameter(parameterName: string): number {
if (parameterName === 'skyColor') {
return this.light.color.getHex();
}
if (parameterName === 'groundColor') {
return this.light.groundColor.getHex();
}
return 0;
}
updateBooleanParameter(parameterName: string, value: boolean): void {}
updateRotation() {
if (this.top === 'Z+') {
Expand Down
19 changes: 19 additions & 0 deletions Extensions/3D/LinearFog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,32 @@ namespace gdjs {
this.fog.far = value;
}
}
getDoubleParameter(parameterName: string): number {
if (parameterName === 'near') {
return this.fog.near;
} else if (parameterName === 'far') {
return this.fog.far;
}
return 0;
}
updateStringParameter(parameterName: string, value: string): void {
if (parameterName === 'color') {
this.fog.color = new THREE.Color(
gdjs.PixiFiltersTools.rgbOrHexToHexNumber(value)
);
}
}
updateColorParameter(parameterName: string, value: number): void {
if (parameterName === 'color') {
this.fog.color.setHex(value);
}
}
getColorParameter(parameterName: string): number {
if (parameterName === 'color') {
return this.fog.color.getHex();
}
return 0;
}
updateBooleanParameter(parameterName: string, value: boolean): void {}
})();
}
Expand Down
36 changes: 36 additions & 0 deletions Extensions/Effects/adjustment-pixi-filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,47 @@ namespace gdjs {
adjustmentFilter.alpha = value;
}
}
getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
const adjustmentFilter = (filter as unknown) as PIXI.filters.AdjustmentFilter;
if (parameterName === 'gamma') {
return adjustmentFilter.gamma;
}
if (parameterName === 'saturation') {
return adjustmentFilter.saturation;
}
if (parameterName === 'contrast') {
return adjustmentFilter.contrast;
}
if (parameterName === 'brightness') {
return adjustmentFilter.brightness;
}
if (parameterName === 'red') {
return adjustmentFilter.red;
}
if (parameterName === 'green') {
return adjustmentFilter.green;
}
if (parameterName === 'blue') {
return adjustmentFilter.blue;
}
if (parameterName === 'alpha') {
return adjustmentFilter.alpha;
}
return 0;
}
updateStringParameter(
filter: PIXI.Filter,
parameterName: string,
value: string
) {}
updateColorParameter(
filter: PIXI.Filter,
parameterName: string,
value: number
): void {}
getColorParameter(filter: PIXI.Filter, parameterName: string): number {
return 0;
}
updateBooleanParameter(
filter: PIXI.Filter,
parameterName: string,
Expand Down
30 changes: 30 additions & 0 deletions Extensions/Effects/advanced-bloom-pixi-filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,41 @@ namespace gdjs {
advancedBloomFilter.padding = value;
}
}
getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
const advancedBloomFilter = (filter as unknown) as PIXI.filters.AdvancedBloomFilter;
if (parameterName === 'threshold') {
return advancedBloomFilter.threshold;
}
if (parameterName === 'bloomScale') {
return advancedBloomFilter.bloomScale;
}
if (parameterName === 'brightness') {
return advancedBloomFilter.brightness;
}
if (parameterName === 'blur') {
return advancedBloomFilter.blur;
}
if (parameterName === 'quality') {
return advancedBloomFilter.quality;
}
if (parameterName === 'padding') {
return advancedBloomFilter.padding;
}
return 0;
}
updateStringParameter(
filter: PIXI.Filter,
parameterName: string,
value: string
) {}
updateColorParameter(
filter: PIXI.Filter,
parameterName: string,
value: number
): void {}
getColorParameter(filter: PIXI.Filter, parameterName: string): number {
return 0;
}
updateBooleanParameter(
filter: PIXI.Filter,
parameterName: string,
Expand Down
15 changes: 15 additions & 0 deletions Extensions/Effects/ascii-pixi-filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,26 @@ namespace gdjs {
asciiFilter.size = value;
}
}
getDoubleParameter(filter: PIXI.Filter, parameterName: string): number {
const asciiFilter = (filter as unknown) as PIXI.filters.AsciiFilter;
if (parameterName === 'size') {
return asciiFilter.size;
}
return 0;
}
updateStringParameter(
filter: PIXI.Filter,
parameterName: string,
value: string
) {}
updateColorParameter(
filter: PIXI.Filter,
parameterName: string,
value: number
): void {}
getColorParameter(filter: PIXI.Filter, parameterName: string): number {
return 0;
}
updateBooleanParameter(
filter: PIXI.Filter,
parameterName: string,
Expand Down
Loading