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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Dots101/Entities101/Assets/Firefighters/Common/Bot.mat
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
version: 10
2 changes: 1 addition & 1 deletion Dots101/Entities101/Assets/Firefighters/Common/Bucket.mat
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
version: 10
34 changes: 11 additions & 23 deletions Dots101/Entities101/Assets/Firefighters/Common/ExecuteAuthoring.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class ExecuteAuthoring : MonoBehaviour
public bool ExecuteTeamSystem;
public bool ExecuteUISystem;
public bool ExecuteAnimationSystem;

class Baker : Baker<ExecuteAuthoring>
{
public override void Bake(ExecuteAuthoring authoring)
Expand All @@ -36,12 +36,12 @@ public override void Bake(ExecuteAuthoring authoring)
{
AddComponent<ExecuteTeam>(entity);
}

if (authoring.ExecuteUISystem)
{
AddComponent<ExecuteUI>(entity);
}

if (authoring.ExecuteAnimationSystem)
{
AddComponent<ExecuteAnimation>(entity);
Expand All @@ -50,27 +50,15 @@ public override void Bake(ExecuteAuthoring authoring)
}
}

public struct ExecuteHeat : IComponentData
{
}
public struct ExecuteHeat : IComponentData { }

public struct ExecuteBot : IComponentData
{
}
public struct ExecuteBot : IComponentData { }

public struct ExecuteBucket : IComponentData
{
}
public struct ExecuteBucket : IComponentData { }

public struct ExecuteTeam : IComponentData
{
}

public struct ExecuteUI : IComponentData
{
}

public struct ExecuteAnimation : IComponentData
{
}
public struct ExecuteTeam : IComponentData { }

public struct ExecuteUI : IComponentData { }

public struct ExecuteAnimation : IComponentData { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
version: 10
2 changes: 1 addition & 1 deletion Dots101/Entities101/Assets/Firefighters/Common/Pond.mat
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
version: 10
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Material:
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
- _EMISSION
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: []
Expand Down Expand Up @@ -87,6 +88,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 1
- _AlphaToMask: 1
- _Blend: 0
Expand Down Expand Up @@ -133,6 +135,7 @@ Material:
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _XRMotionVectorsPass: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
Expand All @@ -156,4 +159,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
version: 10
8 changes: 3 additions & 5 deletions Dots101/Entities101/Assets/Firefighters/Step 1/Components.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@ public struct TeamMember : IBufferElementData
}

// used as a flag to signal that the team needs to be repositioned
public struct RepositionLine : IComponentData, IEnableableComponent
{
}
public struct RepositionLine : IComponentData, IEnableableComponent { }

public struct Heat : IBufferElementData
{
public float Value;
}

public class BotAnimation : IComponentData
{
public GameObject AnimatedGO; // the GO that is rendered and animated
public GameObject AnimatedGO; // the GO that is rendered and animated
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,5 @@ public override void Bake(GroundCellAuthoring authoring)
}
}

public struct GroundCell : IComponentData
{

}
public struct GroundCell : IComponentData { }
}

Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,5 @@ public override void Bake(PondAuthoring authoring)
}
}

public struct Pond : IComponentData
{

}
public struct Pond : IComponentData { }
}

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ OcclusionCullingSettings:
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
serializedVersion: 10
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
Expand All @@ -38,13 +38,12 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
serializedVersion: 13
m_BakeOnSceneLoad: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
Expand All @@ -67,9 +66,6 @@ LightmapSettings:
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
Expand Down Expand Up @@ -97,7 +93,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
Expand Down Expand Up @@ -159,8 +155,8 @@ Camera:
m_GameObject: {fileID: 194095666}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_ClearFlags: 2
m_BackGroundColor: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 1}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
Expand Down Expand Up @@ -208,14 +204,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 194095666}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
serializedVersion: 2
m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
m_LocalPosition: {x: 0, y: 3, z: -3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
--- !u!114 &194095670
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -246,19 +242,20 @@ MonoBehaviour:
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
quality: 3
frameInfluence: 0.1
jitterScale: 1
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
m_Version: 2
--- !u!1 &948347921
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -285,10 +282,9 @@ Light:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 948347921}
m_Enabled: 1
serializedVersion: 10
serializedVersion: 11
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
Expand All @@ -298,7 +294,7 @@ Light:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Strength: 0.5
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
Expand Down Expand Up @@ -337,22 +333,26 @@ Light:
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ForceVisible: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
m_LightUnit: 1
m_LuxAtDistance: 1
m_EnableSpotReflector: 1
--- !u!4 &948347923
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 948347921}
serializedVersion: 2
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &948347924
MonoBehaviour:
Expand All @@ -366,17 +366,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 2
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!1 &1382613142
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -422,11 +428,18 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1382613142}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 194095669}
- {fileID: 948347923}
- {fileID: 1382613144}
Loading