Added screen entity

SCP-CBN · Jan 17, 2021 · f96b3fa · f96b3fa
1 parent 63b8d34
commit f96b3fa
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/CBRE.DataStructures/GameData/GameData.cs b/CBRE.DataStructures/GameData/GameData.cs
@@ -49,6 +49,11 @@ public GameData() {
             modelDataObj.Properties.Add(new Property("scale", VariableType.Vector) { ShortDescription = "Scale", DefaultValue = "1 1 1" });
             Classes.Add(modelDataObj);
 
+            var screenDataObj = new GameDataObject("screen", "Savescreen.", ClassType.Point);
+            screenDataObj.Properties.Add(new Property("imgpath", VariableType.Other) { ShortDescription = "Image Path", DefaultValue = "" });
+            screenDataObj.Behaviours.Add(new Behaviour("sprite", "sprites/screen"));
+            Classes.Add(screenDataObj);
+
             var noShadowObj = new GameDataObject("noshadow", "Disables shadow casting for this brush.", ClassType.Solid);
             Classes.Add(noShadowObj);
 

diff --git a/CBRE.Editor/CBRE.Editor.csproj b/CBRE.Editor/CBRE.Editor.csproj
@@ -792,6 +792,9 @@
     <None Include="Sprites\waypoint.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <Content Include="Sprites\screen.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="ToolTextures\BLOCK_LIGHT.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/CBRE.Editor/Compiling/RMeshExport.cs b/CBRE.Editor/Compiling/RMeshExport.cs
@@ -65,6 +65,8 @@ public static void SaveToFile(string filename, Document document, ExportForm for
 
             IEnumerable<Entity> props = map.WorldSpawn.Find(x => x.ClassName != null && x.ClassName.ToLower() == "model").OfType<Entity>();
 
+            IEnumerable<Entity> screens = map.WorldSpawn.Find(x => x.ClassName != null && x.ClassName.ToLower() == "screen").OfType<Entity>();
+
             FileStream stream = new FileStream(filepath + "/" + filename, FileMode.Create);
             BinaryWriter br = new BinaryWriter(stream);
 
@@ -232,7 +234,7 @@ public static void SaveToFile(string filename, Document document, ExportForm for
                 br.Write((Int32)0);
             }
 
-            br.Write((Int32)(lights.Count + waypoints.Count + soundEmitters.Count() + props.Count()));
+            br.Write((Int32)(lights.Count + waypoints.Count + soundEmitters.Count() + props.Count() + screens.Count()));
 
             foreach (Light light in lights) {
                 br.WriteB3DString("light");
@@ -296,6 +298,16 @@ public static void SaveToFile(string filename, Document document, ExportForm for
                 br.Write((float)scale.Z);
             }
 
+            foreach (Entity screen in screens) {
+                br.WriteB3DString("screen");
+
+                br.Write((float)screen.Origin.X);
+                br.Write((float)screen.Origin.Z);
+                br.Write((float)screen.Origin.Y);
+
+                br.WriteB3DString(screen.EntityData.GetPropertyValue("imgpath"));
+            }
+
             br.Dispose();
             stream.Dispose();
 

diff --git a/CBRE.Editor/Sprites/screen.png b/CBRE.Editor/Sprites/screen.png