Skip to content

Commit f9d67a5

Browse files
Merge pull request #28 from ArtifactForms/working
Merge Modifier Refactoring
2 parents e76590c + 6291610 commit f9d67a5

36 files changed

+4884
-2003
lines changed

documentation/modifiers.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ desired effects.
9999
* **PushPullModifier:** Pushes or pulls vertices towards or away from a specified center point.
100100
* **RandomHolesModifier:**
101101
* **RemoveDoubleVerticesModifier:** Removes duplicate vertices from the mesh.
102+
* **RippleModifier:** Applies a ripple effect based on sinusoidal wave functions.
102103
* **RotateXModifier:** Rotates the mesh around the X-axis.
103104
* **RotateYModifier:** Rotates the mesh around the Y-axis.
104105
* **RotateZModifier:** Rotates the mesh around the Z-axis.
@@ -109,6 +110,7 @@ desired effects.
109110
* **SpherifyModifier:** Spherifies the mesh.
110111
* **TranslateModifier:** Translates the mesh.
111112
* **UpdateFaceNormalsModifier** Updates the face normals of the mesh.
113+
* **WaveModifier:** Applies a wave-like deformation, simulating the appearance of sinusoidal wave.
112114
* **WireframeModifier:** Converts the mesh to a wireframe representation.
113115

114116
## Subdivision Modifiers

src/main/java/math/Color.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,10 @@ public Color subtractLocal(float r, float g, float b, float a) {
325325
* @return this
326326
*/
327327
public Color divideLocal(float a) {
328-
r /= a;
329-
g /= a;
330-
b /= a;
331-
a /= a;
328+
this.r /= a;
329+
this.g /= a;
330+
this.b /= a;
331+
this.a /= a;
332332
return this;
333333
}
334334

src/main/java/math/GeometryUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public static double angleBetweenVectors(Vector3f v1, Vector3f v2) {
129129
* values between 0 and 1 will return points in between.
130130
* @return The point along the line segment.
131131
*/
132-
public Vector2f getDistributionPoint(Vector2f start, Vector2f end,
132+
public static Vector2f getDistributionPoint(Vector2f start, Vector2f end,
133133
float lambda) {
134134
float scalar = 1f / (1f + lambda);
135135
return start.add(end.mult(lambda)).mult(scalar);

0 commit comments

Comments
 (0)