Skip to content

Commit fd542dc

Browse files
authored
Merge pull request #3269 from moisesjpelaez/general_fixes
Minor fixes
2 parents be8bf95 + 7e1b70b commit fd542dc

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

armory/Sources/iron/data/SceneFormat.hx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,9 +394,9 @@ typedef TTilesheetData = {
394394
@:structInit class TTilesheetData {
395395
#end
396396
public var actions: Array<TTilesheetAction>;
397-
@:optional public var start_action: String;
398-
@:optional public var flipx: Bool;
399-
@:optional public var flipy: Bool;
397+
public var start_action: String;
398+
public var flipx: Bool;
399+
public var flipy: Bool;
400400
}
401401

402402
#if js

armory/Sources/iron/object/ParticleSystemCPU.hx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,12 @@ class ParticleSystemCPU {
429429
// Just using the first slot for now: 1 texture slot
430430
// TODO: use all available slots ?
431431
for (slot in textureSlots.keys()) {
432-
if (textureSlots[slot].use_map_size) return textureSlots[slot].size_factor * textureFactor;
432+
if (textureSlots[slot].use_map_size) {
433+
var sizeFactor: FastFloat = textureSlots[slot].size_factor;
434+
return sizeFactor * textureFactor;
435+
}
433436
}
434-
return 0;
437+
return 0.0;
435438
}
436439

437440
function getRampElementsLength(): Int {

armory/Sources/iron/object/Tilesheet.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class Tilesheet {
3535
pendingAction = actions[0].name;
3636
}
3737

38-
if (tilesheetData.flipx != null) flipX = tilesheetData.flipx;
39-
if (tilesheetData.flipy != null) flipY = tilesheetData.flipy;
38+
flipX = tilesheetData.flipx;
39+
flipY = tilesheetData.flipy;
4040

4141
// If no actions need mesh swapping, ready immediately
4242
var hasMeshActions: Bool = false;

0 commit comments

Comments
 (0)