Skip to content

Commit 08c6373

Browse files
pstoicapstoica
committed
rename envelope1 to envelope
1 parent 8a62de4 commit 08c6373

5 files changed

Lines changed: 44 additions & 50 deletions

File tree

‎App/app.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ declare namespace CS {
430430
public particleLifetime : number
431431
public emitRate : number
432432
public maxParticles : number
433-
public envelope1 : BrushEnvelope
433+
public envelope : BrushEnvelope
434434
public particleSprite : UnityEngine.Sprite
435435
public particleMaterial : UnityEngine.Material
436436
public gradientId : string

‎App/components/PropertySubmenus/BrushSubmenu.tsx‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@ export function BrushSubmenu() {
2626
<AutoIndexedControls variant="knob">
2727
<PropertyKnob
2828
label="attack"
29-
value={brush.envelope1?.attackTime ?? 0}
29+
value={brush.envelope?.attackTime ?? 0}
3030
onChange={(value) =>
3131
brushActions.updateEnvelopeProperty("attackTime", value)
3232
}
3333
max={3.0}
3434
displayValue={
35-
(brush.envelope1?.attackTime ?? 0) < 0.01
35+
(brush.envelope?.attackTime ?? 0) < 0.01
3636
? "off"
37-
: `${((brush.envelope1?.attackTime ?? 0) * 5).toFixed(2)}s`
37+
: `${((brush.envelope?.attackTime ?? 0) * 5).toFixed(2)}s`
3838
}
3939
/>
4040

4141
<PropertyKnob
4242
label="fade"
43-
value={brush.envelope1?.attackOpacityDepth ?? 0}
43+
value={brush.envelope?.attackOpacityDepth ?? 0}
4444
onChange={(value) =>
4545
brushActions.updateEnvelopeProperty("attackOpacityDepth", value)
4646
}
4747
displayValue={
48-
(brush.envelope1?.attackOpacityDepth ?? 0) < 0.01
48+
(brush.envelope?.attackOpacityDepth ?? 0) < 0.01
4949
? "off"
50-
: `${((brush.envelope1?.attackOpacityDepth ?? 0) * 100).toFixed(
50+
: `${((brush.envelope?.attackOpacityDepth ?? 0) * 100).toFixed(
5151
0
5252
)}%`
5353
}
@@ -56,7 +56,7 @@ export function BrushSubmenu() {
5656
<PropertyKnob
5757
label="size"
5858
variant="bipolar"
59-
value={(brush.envelope1?.attackSizeDepth ?? 0) * 0.5 + 0.5}
59+
value={(brush.envelope?.attackSizeDepth ?? 0) * 0.5 + 0.5}
6060
onChange={(value) =>
6161
brushActions.updateEnvelopeProperty(
6262
"attackSizeDepth",
@@ -65,9 +65,9 @@ export function BrushSubmenu() {
6565
}
6666
defaultValue={0.5}
6767
displayValue={
68-
Math.abs(brush.envelope1?.attackSizeDepth ?? 0) < 0.01
68+
Math.abs(brush.envelope?.attackSizeDepth ?? 0) < 0.01
6969
? "off"
70-
: (brush.envelope1?.attackSizeDepth ?? 0) < 0
70+
: (brush.envelope?.attackSizeDepth ?? 0) < 0
7171
? "shrink"
7272
: "grow"
7373
}
@@ -77,13 +77,11 @@ export function BrushSubmenu() {
7777

7878
<PropertyKnob
7979
label="curve"
80-
value={brush.envelope1?.curve ?? 0}
80+
value={brush.envelope?.curve ?? 0}
8181
onChange={(value) =>
8282
brushActions.updateEnvelopeProperty("curve", value)
8383
}
84-
displayValue={`${((brush.envelope1?.curve ?? 0) * 100).toFixed(
85-
0
86-
)}%`}
84+
displayValue={`${((brush.envelope?.curve ?? 0) * 100).toFixed(0)}%`}
8785
/>
8886

8987
<PropertyKnob
@@ -103,14 +101,14 @@ export function BrushSubmenu() {
103101

104102
<PropertyKnob
105103
label="fade"
106-
value={brush.envelope1?.decayOpacityDepth ?? 0}
104+
value={brush.envelope?.decayOpacityDepth ?? 0}
107105
onChange={(value) =>
108106
brushActions.updateEnvelopeProperty("decayOpacityDepth", value)
109107
}
110108
displayValue={
111-
(brush.envelope1?.decayOpacityDepth ?? 0) < 0.01
109+
(brush.envelope?.decayOpacityDepth ?? 0) < 0.01
112110
? "off"
113-
: `${((brush.envelope1?.decayOpacityDepth ?? 0) * 100).toFixed(
111+
: `${((brush.envelope?.decayOpacityDepth ?? 0) * 100).toFixed(
114112
0
115113
)}%`
116114
}
@@ -120,7 +118,7 @@ export function BrushSubmenu() {
120118
<PropertyKnob
121119
label="size"
122120
variant="bipolar"
123-
value={(brush.envelope1?.decaySizeDepth ?? 0) * 0.5 + 0.5}
121+
value={(brush.envelope?.decaySizeDepth ?? 0) * 0.5 + 0.5}
124122
onChange={(value) =>
125123
brushActions.updateEnvelopeProperty(
126124
"decaySizeDepth",
@@ -129,18 +127,14 @@ export function BrushSubmenu() {
129127
}
130128
defaultValue={0.5}
131129
displayValue={
132-
Math.abs(brush.envelope1?.decaySizeDepth ?? 0) < 0.01
130+
Math.abs(brush.envelope?.decaySizeDepth ?? 0) < 0.01
133131
? "off"
134-
: (brush.envelope1?.decaySizeDepth ?? 0) < 0
132+
: (brush.envelope?.decaySizeDepth ?? 0) < 0
135133
? "shrink"
136134
: "grow"
137135
}
138136
disabled={!hasLifetime}
139137
/>
140-
141-
<div />
142-
<div />
143-
<div />
144138
</AutoIndexedControls>
145139
);
146140
}

‎App/stores/brushStore.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ function mergeBrushSnapshot(target: BrushUISignal, source: BrushUISnapshot) {
173173
const sourceValue = source[key];
174174
const targetValue = (target as any)[key];
175175

176-
// Deep merge for envelope1 object
177-
if (key === 'envelope1' && sourceValue && typeof sourceValue === 'object' && targetValue && typeof targetValue === 'object') {
176+
// Deep merge for envelope object
177+
if (key === 'envelope' && sourceValue && typeof sourceValue === 'object' && targetValue && typeof targetValue === 'object') {
178178
for (const envKey of Object.keys(sourceValue)) {
179179
targetValue[envKey] = sourceValue[envKey];
180180
}
@@ -571,13 +571,13 @@ export function applyPresetToBrush(
571571
brush.emitRate = presetProps.emitRate ?? 0.5;
572572
brush.particleLifetime = presetProps.particleLifetime ?? 0;
573573

574-
if (brush.envelope1) {
575-
brush.envelope1.attackTime = presetProps.envelope1?.attackTime ?? 0;
576-
brush.envelope1.attackOpacityDepth = presetProps.envelope1?.attackOpacityDepth ?? 0;
577-
brush.envelope1.attackSizeDepth = presetProps.envelope1?.attackSizeDepth ?? 0;
578-
brush.envelope1.decayOpacityDepth = presetProps.envelope1?.decayOpacityDepth ?? 0;
579-
brush.envelope1.decaySizeDepth = presetProps.envelope1?.decaySizeDepth ?? 0;
580-
brush.envelope1.curve = presetProps.envelope1?.curve ?? 0;
574+
if (brush.envelope) {
575+
brush.envelope.attackTime = presetProps.envelope?.attackTime ?? 0;
576+
brush.envelope.attackOpacityDepth = presetProps.envelope?.attackOpacityDepth ?? 0;
577+
brush.envelope.attackSizeDepth = presetProps.envelope?.attackSizeDepth ?? 0;
578+
brush.envelope.decayOpacityDepth = presetProps.envelope?.decayOpacityDepth ?? 0;
579+
brush.envelope.decaySizeDepth = presetProps.envelope?.decaySizeDepth ?? 0;
580+
brush.envelope.curve = presetProps.envelope?.curve ?? 0;
581581
}
582582

583583
if (presetProps.gradientId && typeof presetProps.gradientId === "string") {
@@ -1445,14 +1445,14 @@ export const brushActions = {
14451445

14461446
updateEnvelopeProperty(property: string, value: any) {
14471447
const brush = currentBrush.value;
1448-
if (!brush || !brush.envelope1) return;
1448+
if (!brush || !brush.envelope) return;
14491449

1450-
(brush.envelope1 as any)[property] = value;
1450+
(brush.envelope as any)[property] = value;
14511451
brush.isDirty = true;
14521452

14531453
const uiBrush = currentBrushState.value;
1454-
if (uiBrush && uiBrush.envelope1) {
1455-
(uiBrush.envelope1 as any)[property] = value;
1454+
if (uiBrush && uiBrush.envelope) {
1455+
(uiBrush.envelope as any)[property] = value;
14561456
uiBrush.isDirty = true;
14571457
}
14581458
},
@@ -1985,13 +1985,13 @@ export const brushActions = {
19851985
) || "Sine",
19861986
emitRate: brush.emitRate,
19871987
particleLifetime: brush.particleLifetime,
1988-
envelope1: brush.envelope1 ? {
1989-
attackTime: brush.envelope1.attackTime,
1990-
attackOpacityDepth: brush.envelope1.attackOpacityDepth,
1991-
attackSizeDepth: brush.envelope1.attackSizeDepth,
1992-
decayOpacityDepth: brush.envelope1.decayOpacityDepth,
1993-
decaySizeDepth: brush.envelope1.decaySizeDepth,
1994-
curve: brush.envelope1.curve,
1988+
envelope: brush.envelope ? {
1989+
attackTime: brush.envelope.attackTime,
1990+
attackOpacityDepth: brush.envelope.attackOpacityDepth,
1991+
attackSizeDepth: brush.envelope.attackSizeDepth,
1992+
decayOpacityDepth: brush.envelope.decayOpacityDepth,
1993+
decaySizeDepth: brush.envelope.decaySizeDepth,
1994+
curve: brush.envelope.curve,
19951995
} : undefined,
19961996
drawOnMove: brush.drawOnMove,
19971997
retriggerOnDraw: brush.retriggerOnDraw,

‎Assets/BrushProperties.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public class BrushProperties
175175
public float maxParticles = 0.8f; // Normalized 0-1, maps to ParameterNormalizer.GetMaxParticles()
176176

177177
[Header("Envelope System")]
178-
public BrushEnvelope envelope1 = new BrushEnvelope();
178+
public BrushEnvelope envelope = new BrushEnvelope();
179179
// Phase 2: envelope2
180180

181181
[Header("Sprite Settings")]
@@ -290,7 +290,7 @@ public BrushProperties Clone()
290290
clone.particleLifetime = this.particleLifetime;
291291
clone.emitRate = this.emitRate;
292292
clone.maxParticles = this.maxParticles;
293-
clone.envelope1 = this.envelope1; // BrushEnvelope is a class, this is a reference copy (fine for Phase 1)
293+
clone.envelope = this.envelope; // BrushEnvelope is a class, this is a reference copy (fine for Phase 1)
294294
clone.particleSprite = this.particleSprite;
295295
clone.particleMaterial = this.particleMaterial;
296296
clone.gradientId = this.gradientId;

‎Assets/CustomParticleRenderer.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,9 @@ private bool TryComputeParticleSample(BrushProperties brush, BrushShapeModule sh
386386

387387
float opacityMult = 1.0f;
388388

389-
if (brush.envelope1 != null)
389+
if (brush.envelope != null)
390390
{
391-
opacityMult = brush.envelope1.GetOpacityMultiplier(particle.age, particle.lifetime);
391+
opacityMult = brush.envelope.GetOpacityMultiplier(particle.age, particle.lifetime);
392392
}
393393

394394
if (hasShapeSource)
@@ -417,9 +417,9 @@ private bool TryComputeParticleSample(BrushProperties brush, BrushShapeModule sh
417417
float maxSizeNormalized = shapeModule.SizeRange.y;
418418
float referenceSize = ParameterNormalizer.GetSize(maxSizeNormalized);
419419

420-
if (brush.envelope1 != null)
420+
if (brush.envelope != null)
421421
{
422-
sample.particleSize = brush.envelope1.GetSizeMultiplier(particle.age, particle.lifetime, referenceSize);
422+
sample.particleSize = brush.envelope.GetSizeMultiplier(particle.age, particle.lifetime, referenceSize);
423423
}
424424
else
425425
{

0 commit comments

Comments
 (0)