fix build errors

This commit is contained in:
2022-12-05 08:10:00 +01:00
parent 9b262ce4c9
commit edf9ccab0b
9 changed files with 304 additions and 274 deletions

View File

@@ -7,7 +7,7 @@ LightingSettings:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Lighting Settings
serializedVersion: 4
serializedVersion: 5
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
@@ -16,7 +16,7 @@ LightingSettings:
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 1
m_BakeBackend: 1
m_BakeBackend: 2
m_LightmapMaxSize: 1024
m_BakeResolution: 40
m_Padding: 2
@@ -47,7 +47,7 @@ LightingSettings:
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
m_PVRMinBounces: 1
m_PVREnvironmentMIS: 1
m_PVREnvironmentImportanceSampling: 1
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
@@ -62,3 +62,4 @@ LightingSettings:
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_PVRTiledBaking: 0
m_NumRaysToShootPerTexel: -1

View File

@@ -4,6 +4,7 @@ using UnityEngine.UIElements;
namespace EscapeRoomEngine.Engine.Runtime.Editor
{
#if UNITY_EDITOR
public class EngineEditor : EditorWindow
{
private bool _registeredUpdateEvent;
@@ -86,4 +87,5 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor
_skipAndPassButton.SetEnabled(EditorApplication.isPlaying && Engine.DefaultEngine.NumberOfRooms > 0);
}
}
#endif
}

View File

@@ -36,7 +36,7 @@ namespace EscapeRoomEngine.Engine.Runtime
public IOption<Room> CurrentRoom => NumberOfRooms > 0 ? Some<Room>.Of(_rooms[^1]) : None<Room>.New();
private readonly List<Room> _rooms = new();
private GameObject _playSpaceOrigin, _environment;
private GameObject _playSpaceOrigin;
private void Start()
{
@@ -44,11 +44,6 @@ namespace EscapeRoomEngine.Engine.Runtime
_playSpaceOrigin.transform.SetParent(transform);
_playSpaceOrigin.transform.localPosition = new Vector3(-theme.playSpace.x / 2f, 0, -theme.playSpace.y / 2f);
if (theme.environment)
{
_environment = Instantiate(theme.environment, _playSpaceOrigin.transform, false);
}
GenerateRoom();
}
@@ -62,11 +57,16 @@ namespace EscapeRoomEngine.Engine.Runtime
var room = new Room(entrance);
_rooms.Add(room);
GenerateSpace(room, entrance); // TODO: rooms with more than one space
GenerateSpace(room, entrance);
var roomId = _rooms.Count - 1;
room.InstantiateRoom(_playSpaceOrigin.transform, roomId * roomOffset, roomId.ToString());
if (theme.environment)
{
Instantiate(theme.environment, room.roomObject.transform, false);
}
UpdateUI();
}