Skip to content

Add a new center mode "Centered on Z only" for 3D model objects #8338

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.

Sign up for GitHub

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

Open
D8H wants to merge 1 commit into
base: master
Choose a base branch
from
+168 −137
Open

Add a new center mode "Centered on Z only" for 3D model objects #8338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
118 changes: 91 additions & 27 deletions Extensions/3D/JsExtension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3071,9 +3071,9 @@ module.exports = {
/** @type {number} */
_defaultDepth;

/** @type {[number, number, number] | null} */
/** @type {[number | null, number | null, number | null]} */
_originPoint;
/** @type {[number, number, number] | null} */
/** @type {[number | null, number | null, number | null]} */
_centerPoint;

/** @type {[number, number, number]} */
Expand Down Expand Up @@ -3168,11 +3168,31 @@ module.exports = {
}

getOriginPoint() {
return this._originPoint || this._modelOriginPoint;
return [
this._originPoint[0] === null
? this._modelOriginPoint[0]
: this._originPoint[0],
this._originPoint[1] === null
? this._modelOriginPoint[1]
: this._originPoint[1],
this._originPoint[2] === null
? this._modelOriginPoint[2]
: this._originPoint[2],
];
}

getCenterPoint() {
return this._centerPoint || this._modelOriginPoint;
return [
this._centerPoint[0] === null
? this._modelOriginPoint[0]
: this._centerPoint[0],
this._centerPoint[1] === null
? this._modelOriginPoint[1]
: this._centerPoint[1],
this._centerPoint[2] === null
? this._modelOriginPoint[2]
: this._centerPoint[2],
];
}

_updateDefaultTransformation(
Expand Down Expand Up @@ -3219,12 +3239,23 @@ module.exports = {

// Center the model.
const centerPoint = this._centerPoint;
if (centerPoint) {
threeObject.position.set(
-(boundingBox.min.x + modelWidth * centerPoint[0]),
// The model is flipped on Y axis.
-(boundingBox.min.y + modelHeight * (1 - centerPoint[1])),
-(boundingBox.min.z + modelDepth * centerPoint[2])
if (centerPoint[0]) {
threeObject.position.x = -(
boundingBox.min.x +
modelWidth * centerPoint[0]
);
}
if (centerPoint[1]) {
// The model is flipped on Y axis.
threeObject.position.y = -(
boundingBox.min.y +
modelHeight * (1 - centerPoint[1])
);
}
if (centerPoint[2]) {
threeObject.position.z = -(
boundingBox.min.z +
modelDepth * centerPoint[2]
);
}

Expand Down Expand Up @@ -3320,8 +3351,8 @@ module.exports = {
}

/**
* @param {[number, number, number] | null} point1
* @param {[number, number, number] | null} point2
* @param {[number | null, number | null, number | null]} point1
* @param {[number | null, number | null, number | null]} point2
* @returns {boolean}
*/
const isSamePoint = (point1, point2) => {
Expand All @@ -3337,22 +3368,24 @@ module.exports = {

/**
* @param {string} location
* @returns {[number, number, number] | null}
* @returns {[number | null, number | null, number | null]}
*/
const getPointForLocation = (location) => {
switch (location) {
case 'ModelOrigin':
return null;
return [null, null, null];
case 'ObjectCenter':
return [0.5, 0.5, 0.5];
case 'CenteredOnZ':
return [null, null, 0.5];
case 'BottomCenterZ':
return [0.5, 0.5, 0];
case 'BottomCenterY':
return [0.5, 1, 0.5];
case 'TopLeft':
return [0, 0, 0];
default:
return null;
return [null, null, null];
}
};

Expand All @@ -3367,10 +3400,10 @@ module.exports = {
_rotationY = 0;
_rotationZ = 0;
_keepAspectRatio = false;
/** @type {[number, number, number] | null} */
_originPoint = null;
/** @type {[number, number, number] | null} */
_centerPoint = null;
/** @type {[number | null, number | null, number | null]} */
_originPoint = [null, null, null];
/** @type {[number | null, number | null, number | null]} */
_centerPoint = [null, null, null];

/** @type {[number, number, number]} */
_modelOriginPoint = [0, 0, 0];
Expand Down Expand Up @@ -3436,11 +3469,31 @@ module.exports = {
}

getOriginPoint() {
return this._originPoint || this._modelOriginPoint;
return [
this._originPoint[0] === null
? this._modelOriginPoint[0]
: this._originPoint[0],
this._originPoint[1] === null
? this._modelOriginPoint[1]
: this._originPoint[1],
this._originPoint[2] === null
? this._modelOriginPoint[2]
: this._originPoint[2],
];
}

getCenterPoint() {
return this._centerPoint || this._modelOriginPoint;
return [
this._centerPoint[0] === null
? this._modelOriginPoint[0]
: this._centerPoint[0],
this._centerPoint[1] === null
? this._modelOriginPoint[1]
: this._centerPoint[1],
this._centerPoint[2] === null
? this._modelOriginPoint[2]
: this._centerPoint[2],
];
}

_updateDefaultTransformation() {
Expand Down Expand Up @@ -3493,12 +3546,23 @@ module.exports = {

// Center the model.
const centerPoint = this._centerPoint;
if (centerPoint) {
threeModelGroup.position.set(
-(boundingBox.min.x + modelWidth * centerPoint[0]),
// The model is flipped on Y axis.
-(boundingBox.min.y + modelHeight * (1 - centerPoint[1])),
-(boundingBox.min.z + modelDepth * centerPoint[2])
if (centerPoint[0] !== null) {
threeModelGroup.position.x = -(
boundingBox.min.x +
modelWidth * centerPoint[0]
);
}
if (centerPoint[1] !== null) {
// The model is flipped on Y axis.
threeModelGroup.position.y = -(
boundingBox.min.y +
modelHeight * (1 - centerPoint[1])
);
}
if (centerPoint[2] !== null) {
threeModelGroup.position.z = -(
boundingBox.min.z +
modelDepth * centerPoint[2]
);
}

Expand Down
5 changes: 4 additions & 1 deletion Extensions/3D/Model3DObjectConfiguration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using namespace std;
Model3DObjectConfiguration::Model3DObjectConfiguration()
: width(100), height(100), depth(100), rotationX(90), rotationY(0),
rotationZ(90), modelResourceName(""), materialType("StandardWithoutMetalness"),
originLocation("ModelOrigin"), centerLocation("ModelOrigin"),
originLocation("ModelOrigin"), centerLocation("CenteredOnZ"),
keepAspectRatio(true), crossfadeDuration(0.1f), isCastingShadow(true), isReceivingShadow(true) {}

bool Model3DObjectConfiguration::UpdateProperty(const gd::String &propertyName,
Expand Down Expand Up @@ -89,6 +89,8 @@ bool Model3DObjectConfiguration::UpdateProperty(const gd::String &propertyName,
centerLocation = "ModelOrigin";
else if (normalizedValue == "objectcenter")
centerLocation = "ObjectCenter";
else if (normalizedValue == "centeredonz")
centerLocation = "CenteredOnZ";
else if (normalizedValue == "bottomcenterz")
centerLocation = "BottomCenterZ";
else if (normalizedValue == "bottomcentery")
Expand Down Expand Up @@ -206,6 +208,7 @@ Model3DObjectConfiguration::GetProperties() const {
.SetType("choice")
.AddChoice("ModelOrigin", _("Model origin"))
.AddChoice("ObjectCenter", _("Object center"))
.AddChoice("CenteredOnZ", _("Centered on Z only"))
.AddChoice("BottomCenterZ", _("Bottom center (Z)"))
.AddChoice("BottomCenterY", _("Bottom center (Y)"))
.SetLabel(_("Center point"))
Expand Down
23 changes: 13 additions & 10 deletions Extensions/3D/Model3DRuntimeObject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ namespace gdjs {

type Model3DObjectNetworkSyncDataType = {
mt: number;
op: FloatPoint3D | null;
cp: FloatPoint3D | null;
op: LocationPoint | null;
cp: LocationPoint | null;
anis: Model3DAnimation[];
ai: integer;
ass: float;
Expand Down Expand Up @@ -38,6 +38,7 @@ namespace gdjs {
centerLocation:
| 'ModelOrigin'
| 'ObjectCenter'
| 'CenteredOnZ'
| 'BottomCenterZ'
| 'BottomCenterY';
animations: Model3DAnimation[];
Expand All @@ -47,12 +48,14 @@ namespace gdjs {
};
}

type FloatPoint3D = [float, float, float];
type LocationPoint = [float | null, float | null, float | null];

const getPointForLocation = (location: string): FloatPoint3D | null => {
const getPointForLocation = (location: string): LocationPoint => {
switch (location) {
case 'ModelOrigin':
return null;
return [null, null, null];
case 'CenteredOnZ':
return [null, null, 0.5];
case 'ObjectCenter':
return [0.5, 0.5, 0.5];
case 'BottomCenterZ':
Expand All @@ -62,7 +65,7 @@ namespace gdjs {
case 'TopLeft':
return [0, 0, 0];
default:
return null;
return [null, null, null];
}
};

Expand Down Expand Up @@ -90,7 +93,7 @@ namespace gdjs {
* configuration.
* @see gdjs.Model3DRuntimeObject3DRenderer.getOriginPoint
*/
_originPoint: FloatPoint3D | null;
_originPoint: LocationPoint;
/**
* The local point of the model that is used as rotation center.
*
Expand All @@ -101,7 +104,7 @@ namespace gdjs {
* configuration.
* @see gdjs.Model3DRuntimeObject3DRenderer.getCenterPoint
*/
_centerPoint: FloatPoint3D | null;
_centerPoint: LocationPoint;

_animations: Model3DAnimation[];
_currentAnimationIndex: integer = 0;
Expand Down Expand Up @@ -275,10 +278,10 @@ namespace gdjs {
this._materialType = networkSyncData.mt;
}
if (networkSyncData.op !== undefined) {
this._originPoint = networkSyncData.op;
this._originPoint = networkSyncData.op || [null, null, null];
}
if (networkSyncData.cp !== undefined) {
this._centerPoint = networkSyncData.cp;
this._centerPoint = networkSyncData.cp || [null, null, null];
}
if (networkSyncData.anis !== undefined) {
this._animations = networkSyncData.anis;
Expand Down
53 changes: 43 additions & 10 deletions Extensions/3D/Model3DRuntimeObject3DRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,34 @@ namespace gdjs {
);
}

getOriginPoint() {
return this._model3DRuntimeObject._originPoint || this._modelOriginPoint;
getOriginPoint(): FloatPoint3D {
//@ts-ignore
const point: FloatPoint3D = gdjs.staticArray(
Model3DRuntimeObject3DRenderer.prototype.getOriginPoint
);
const originPoint = this._model3DRuntimeObject._originPoint;
point[0] =
originPoint[0] === null ? this._modelOriginPoint[0] : originPoint[0];
point[1] =
originPoint[1] === null ? this._modelOriginPoint[1] : originPoint[1];
point[2] =
originPoint[2] === null ? this._modelOriginPoint[2] : originPoint[2];
return point;
}

getCenterPoint() {
return this._model3DRuntimeObject._centerPoint || this._modelOriginPoint;
getCenterPoint(): FloatPoint3D {
//@ts-ignore
const point: FloatPoint3D = gdjs.staticArray(
Model3DRuntimeObject3DRenderer.prototype.getCenterPoint
);
const centerPoint = this._model3DRuntimeObject._centerPoint;
point[0] =
centerPoint[0] === null ? this._modelOriginPoint[0] : centerPoint[0];
point[1] =
centerPoint[1] === null ? this._modelOriginPoint[1] : centerPoint[1];
point[2] =
centerPoint[2] === null ? this._modelOriginPoint[2] : centerPoint[2];
return point;
}

/**
Expand Down Expand Up @@ -177,12 +199,23 @@ namespace gdjs {

// Center the model.
const centerPoint = this._model3DRuntimeObject._centerPoint;
if (centerPoint) {
threeObject.position.set(
-(boundingBox.min.x + modelWidth * centerPoint[0]),
// The model is flipped on Y axis.
-(boundingBox.min.y + modelHeight * (1 - centerPoint[1])),
-(boundingBox.min.z + modelDepth * centerPoint[2])
if (centerPoint[0] !== null) {
threeObject.position.x = -(
boundingBox.min.x +
modelWidth * centerPoint[0]
);
}
if (centerPoint[1] !== null) {
// The model is flipped on Y axis.
threeObject.position.y = -(
boundingBox.min.y +
modelHeight * (1 - centerPoint[1])
);
}
if (centerPoint[2] !== null) {
threeObject.position.z = -(
boundingBox.min.z +
modelDepth * centerPoint[2]
);
}

Expand Down
Loading