Merge branch 'master' into skia-text

This commit is contained in:
Nahuel Rocchetti 2024-09-03 14:26:20 -03:00
commit 9a3e97b405
3 changed files with 33 additions and 1 deletions

View file

@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
namespace OpenTS2
{
public static class GameObjectExtensions
{
public static void SetLayerHierarchy(this GameObject go, int layer)
{
var transforms = go.GetComponentsInChildren<Transform>();
foreach(var transform in transforms)
{
transform.gameObject.layer = layer;
}
}
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e0edf7d99923e6e4e8328a1727f8271f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -19,7 +19,7 @@ namespace OpenTS2.Scenes
public class NeighborhoodDecorations : AssetReferenceComponent
{
[GameProperty(false)]
private static bool EnableBatching = true;
private static bool EnableBatching = false;
private Dictionary<string, Material> _roadMaterialLookup = new Dictionary<string, Material>();
private Transform _decorationsParent;
private Transform _roadsParent;