Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion Assets/Atlas.spriteatlas
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ SpriteAtlas:
allowAlphaSplitting: 0
enableRotation: 1
enableTightPacking: 1
enableAlphaDilation: 0
secondaryTextureSettings: {}
variantMultiplier: 1
packables:
- {fileID: 2800000, guid: 252e73463dc5649eca48720230253e81, type: 3}
totalSpriteSurfaceArea: 921600
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
Expand Down
56 changes: 48 additions & 8 deletions Assets/SpriteSheetRenderer/EmojiOne 1.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.68, y: -12.18, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
Expand Down Expand Up @@ -249,7 +250,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c87523ccd27b5014a8ecc87d4d3692a5, type: 3}
m_Name:
m_EditorClassIdentifier:
spriteCount: 10
spriteCount: 120000
sprites:
- {fileID: -654221344278647648, guid: a1ffe2230b9de4eb98a84c30452fa8d5, type: 3}
- {fileID: 6191509826233423226, guid: a1ffe2230b9de4eb98a84c30452fa8d5, type: 3}
Expand Down Expand Up @@ -280,6 +281,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.96, y: -12.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
Expand All @@ -291,7 +293,7 @@ LightingSettings:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Settings.lighting
serializedVersion: 3
serializedVersion: 4
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
Expand All @@ -304,7 +306,7 @@ LightingSettings:
m_LightmapMaxSize: 1024
m_BakeResolution: 40
m_Padding: 2
m_TextureCompression: 1
m_LightmapCompression: 3
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
Expand Down Expand Up @@ -345,3 +347,4 @@ LightingSettings:
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_PVRTiledBaking: 0

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/SpriteSheetRenderer/Systems/ColorBufferSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Unity.Jobs;
using UnityEngine;

public class ColorBufferSystem : SystemBase {
public partial class ColorBufferSystem : SystemBase {
EntityQuery query;

protected override void OnCreate(){
Expand Down
2 changes: 1 addition & 1 deletion Assets/SpriteSheetRenderer/Systems/MatrixBufferSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Unity.Entities;
using Unity.Jobs;

public class MatrixBufferSystem : SystemBase {
public partial class MatrixBufferSystem : SystemBase {
EntityQuery query;

protected override void OnCreate(){
Expand Down
13 changes: 7 additions & 6 deletions Assets/SpriteSheetRenderer/Systems/SpriteSheetAnimationSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using Unity.Jobs;
using UnityEngine;

public class SpriteSheetAnimationSystem : JobComponentSystem {
public partial class SpriteSheetAnimationSystem : SystemBase {
[BurstCompile]
struct SpriteSheetAnimationJob : IJobForEach<SpriteSheetAnimation, SpriteIndex> {
partial struct SpriteSheetAnimationJob : IJobEntity {

public void Execute(ref SpriteSheetAnimation AnimCmp, ref SpriteIndex spriteSheetCmp) {
if(AnimCmp.play && AnimCmp.elapsedFrames % AnimCmp.samples == 0 && AnimCmp.elapsedFrames != 0) {
Expand Down Expand Up @@ -37,9 +37,10 @@ public bool NextWillReachEnd(SpriteSheetAnimation anim, SpriteIndex sprite) {
}
}

protected override JobHandle OnUpdate(JobHandle inputDeps) {
var job = new SpriteSheetAnimationJob();
return job.Schedule(this, inputDeps);
}
protected override void OnUpdate()
{
var job = new SpriteSheetAnimationJob();
job.Schedule();
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Unity.Jobs;
using Unity.Collections;

public class SpriteSheetPositionSystem : SystemBase {
public partial class SpriteSheetPositionSystem : SystemBase {
protected override void OnUpdate(){
Entities.WithName("SpriteSheetPositionSystem").WithChangeFilter<Position2D>().ForEach(
(ref SpriteMatrix renderData, in Position2D translation) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Unity.Jobs;
using Unity.Collections;

public class SpriteSheetRotationSystem : SystemBase {
public partial class SpriteSheetRotationSystem : SystemBase {
protected override void OnUpdate(){
Entities.WithName("SpriteSheetRotationSystem").WithChangeFilter<Rotation2D>().ForEach(
(ref SpriteMatrix renderData, in Rotation2D rotation) => {
Expand Down
Loading