BYOND Parity Renderer

Content.Tests/DMProject/Tests/Stdlib/newmob.dm

@@ -0,0 +1,2 @@
+/proc/RunTest()
+	var/mob/testmob = new

Content.Tests/DMTests.cs

@@ -7,6 +7,7 @@
 using OpenDreamRuntime.Objects;
 using OpenDreamRuntime.Procs;
 using OpenDreamRuntime.Rendering;
+using OpenDreamShared.Rendering;
 using Robust.Shared.Asynchronous;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -47,6 +48,7 @@ public void OneTimeSetup() {
             _taskManager.Initialize();
             IComponentFactory componentFactory = IoCManager.Resolve<IComponentFactory>();
             componentFactory.RegisterClass<DMISpriteComponent>();
+            componentFactory.RegisterClass<DreamMobSightComponent>(); //wow this is terrible TODO figure out why this is necessary
             componentFactory.GenerateNetIds();
             Compile(InitializeEnvironment);
             _dreamMan.PreInitialize(Path.ChangeExtension(InitializeEnvironment, "json"));

DMCompiler/DMStandard/Defines.dm

@@ -20,7 +20,7 @@
 #define OBJ_LAYER 3
 #define MOB_LAYER 4
 #define FLY_LAYER 5
-#define EFFECTS_LAYER 19999
+#define EFFECTS_LAYER 5000
 #define BACKGROUND_LAYER 20000
 
 #define FLOAT_PLANE -32767

DMCompiler/DMStandard/Types/Atoms/_Atom.dm

@@ -27,7 +27,7 @@
 	var/icon = null
 	var/icon_state = ""
 	var/layer = 2.0
-	var/plane = FLOAT_PLANE as opendream_unimplemented
+	var/plane = 0
 	var/alpha = 255
 	var/color = "#FFFFFF"
 	var/invisibility = 0
@@ -36,7 +36,7 @@
 	var/luminosity = 0 as opendream_unimplemented
 	var/opacity = 0 as opendream_unimplemented
 	var/matrix/transform
-	var/blend_mode = 0 as opendream_unimplemented
+	var/blend_mode = 0 
 
 	var/gender = NEUTER
 	var/density = FALSE
@@ -45,18 +45,18 @@
 
 	var/list/filters = null
 	var/appearance as opendream_unimplemented
-	var/appearance_flags as opendream_unimplemented
+	var/appearance_flags = 0
 	var/maptext_width as opendream_unimplemented
 	var/maptext_height as opendream_unimplemented
 	var/maptext_x = 32 as opendream_unimplemented
 	var/maptext_y = 32 as opendream_unimplemented
 	var/step_x as opendream_unimplemented
 	var/step_y as opendream_unimplemented
-	var/render_source as opendream_unimplemented
+	var/render_source
 	var/mouse_drag_pointer as opendream_unimplemented
 	var/mouse_drop_pointer as opendream_unimplemented
 	var/mouse_over_pointer as opendream_unimplemented
-	var/render_target as opendream_unimplemented
+	var/render_target
 	var/vis_flags as opendream_unimplemented
 
 	proc/Click(location, control, params)

DMCompiler/DMStandard/Types/Image.dm

@@ -3,8 +3,8 @@
 
 	var/alpha = 255
 	var/appearance as opendream_unimplemented
-	var/appearance_flags = 0 as opendream_unimplemented
-	var/blend_mode = 0 as opendream_unimplemented
+	var/appearance_flags = 0
+	var/blend_mode = 0
 	var/color = "#FFFFFF"
 	var/desc = null
 	var/gender = "neuter" as opendream_unimplemented
@@ -31,9 +31,9 @@
 	var/pixel_y = 0
 	var/pixel_w = 0 as opendream_unimplemented
 	var/pixel_z = 0 as opendream_unimplemented
-	var/plane = FLOAT_PLANE as opendream_unimplemented
-	var/render_source as opendream_unimplemented
-	var/render_target as opendream_unimplemented
+	var/plane = FLOAT_PLANE
+	var/render_source
+	var/render_target
 	var/suffix as opendream_unimplemented
 	var/text = "i" as opendream_unimplemented
 	var/matrix/transform
@@ -55,7 +55,7 @@
 
 	// The ref does not mention the pixel_x and pixel_y args...
 	New(icon, loc, icon_state, layer, dir, pixel_x, pixel_y)
-		src.icon = icon
+		if (icon != null) src.icon = icon
 		if (!istext(loc))
 			if (loc != null) src.loc = loc
 			if (icon_state != null) src.icon_state = icon_state

DMCompiler/DMStandard/Types/World.dm

@@ -22,7 +22,7 @@
 	var/maxy = 0
 	var/maxz = 0
 	var/icon_size = 32
-	var/view = 7 // The default is actually 5, but we hardcode a 15x15 view for now
+	var/view = 5
 	var/movement_mode = LEGACY_MOVEMENT_MODE as opendream_unimplemented
 
 	var/byond_version = DM_VERSION

OpenDreamClient/EntryPoint.cs

@@ -70,7 +70,6 @@ public override void PostInit() {
             lightManager.DrawShadows = true;
 
             _overlayManager.AddOverlay(new DreamViewOverlay());
-            _overlayManager.AddOverlay(new DreamScreenOverlay());
 
             _dreamInterface.Initialize();
             IoCManager.Resolve<IDreamSoundEngine>().Initialize();

OpenDreamClient/Input/MouseInputSystem.cs

@@ -18,8 +18,10 @@ sealed class MouseInputSystem : SharedMouseInputSystem {
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
 
+        private DreamViewOverlay _dreamViewOverlay;
         private ContextMenuPopup _contextMenu;
 
         public override void Initialize() {
@@ -40,89 +42,60 @@ public bool HandleViewportClick(ScalingViewport viewport, GUIBoundKeyEventArgs a
             bool ctrl = _inputManager.IsKeyDown(Keyboard.Key.Control);
             bool alt = _inputManager.IsKeyDown(Keyboard.Key.Alt);
 
+            Vector2 screenLocPos = (args.RelativePixelPosition - viewportBox.TopLeft) / viewportBox.Size;
+            screenLocPos *= viewport.ViewportSize;
+            screenLocPos.Y = viewport.ViewportSize.Y - screenLocPos.Y; // Flip the Y
+            ScreenLocation screenLoc = new ScreenLocation((int) screenLocPos.X, (int) screenLocPos.Y, 32); // TODO: icon_size other than 32
+
             MapCoordinates mapCoords = viewport.ScreenToMap(args.PointerLocation.Position);
-            EntityUid entity = GetEntityUnderMouse(viewport, args.PointerLocation.Position, mapCoords);
+            EntityUid entity = GetEntityUnderMouse(viewport, screenLocPos, mapCoords);
 
-            if (args.Function == EngineKeyFunctions.UIRightClick) {
-                if (entity == EntityUid.Invalid)
-                    return false;
+            if (entity == EntityUid.Invalid && args.Function != EngineKeyFunctions.UIRightClick) { // Turf was clicked and not a right-click
+                if (_mapManager.TryFindGridAt(mapCoords, out var grid)){
+                    Vector2i position = grid.CoordinatesToTile(mapCoords);
+                    MapCoordinates worldPosition = grid.GridTileToWorld(position);
+                    RaiseNetworkEvent(new TurfClickedEvent(position, (int)worldPosition.MapId, screenLoc,  shift, ctrl, alt));
+                }
+                return true;
+            }
 
-                _contextMenu.RepopulateEntities(_lookupSystem.GetEntitiesInRange(mapCoords, 0.01f));
+            if (args.Function == EngineKeyFunctions.UIRightClick) { //either turf or atom was clicked, and it was a right-click
+                var entities = _lookupSystem.GetEntitiesInRange(mapCoords, 0.01f);
+                //TODO filter entities by the valid verbs that exist on them
+                //they should only show up if there is a verb attached to usr which matches the filter in world syntax
+                //ie, obj|turf in world
+                //note that popup_menu = 0 overrides this behaviour, as does verb invisibility (urgh), and also hidden
+                //because BYOND sure loves redundancy
+                if(entities.Count == 0)
+                    return true; //don't open a 1x1 empty context menu
+                _contextMenu.RepopulateEntities(entities);
                 _contextMenu.Measure(_userInterfaceManager.ModalRoot.Size);
                 Vector2 contextMenuLocation = args.PointerLocation.Position / _userInterfaceManager.ModalRoot.UIScale; // Take scaling into account
                 _contextMenu.Open(UIBox2.FromDimensions(contextMenuLocation, _contextMenu.DesiredSize));
 
                 return true;
             }
 
-            Vector2 screenLocPos = (args.RelativePixelPosition - viewportBox.TopLeft) / viewportBox.Size;
-            screenLocPos *= viewport.ViewportSize;
-            screenLocPos.Y = viewport.ViewportSize.Y - screenLocPos.Y; // Flip the Y
-            ScreenLocation screenLoc = new ScreenLocation((int) screenLocPos.X, (int) screenLocPos.Y, 32); // TODO: icon_size other than 32
-
-            if (entity == EntityUid.Invalid) { // Turf was clicked
-                if (!_mapManager.TryFindGridAt(mapCoords, out var grid))
-                    return false;
-
-                Vector2i position = grid.CoordinatesToTile(mapCoords);
-                MapCoordinates worldPosition = grid.GridTileToWorld(position);
-                RaiseNetworkEvent(new TurfClickedEvent(position, (int)worldPosition.MapId, screenLoc,  shift, ctrl, alt));
-                return true;
-            }
-
-            RaiseNetworkEvent(new EntityClickedEvent(entity, screenLoc, shift, ctrl, alt));
+            if (entity != EntityUid.Invalid) //atom was clicked, and it wasn't a right click
+                RaiseNetworkEvent(new EntityClickedEvent(entity, screenLoc, shift, ctrl, alt));
             return true;
         }
 
         private EntityUid GetEntityUnderMouse(ScalingViewport viewport, Vector2 mousePos, MapCoordinates coords) {
             EntityUid? entity = GetEntityOnScreen(mousePos, viewport);
-            entity ??= GetEntityOnMap(coords);
 
             return entity ?? EntityUid.Invalid;
         }
 
         private EntityUid? GetEntityOnScreen(Vector2 mousePos, ScalingViewport viewport) {
-            ClientScreenOverlaySystem screenOverlay = EntitySystem.Get<ClientScreenOverlaySystem>();
-            EntityUid? eye = _playerManager.LocalPlayer.Session.AttachedEntity;
-            if (eye == null || !_entityManager.TryGetComponent<TransformComponent>(eye.Value, out var eyeTransform)) {
+            _dreamViewOverlay ??= _overlayManager.GetOverlay<DreamViewOverlay>();
+            if(_dreamViewOverlay.MouseMap == null)
                 return null;
-            }
-
-            Vector2 viewOffset = eyeTransform.WorldPosition - 7.5f; //TODO: Don't hardcode a 15x15 view
-            MapCoordinates coords = viewport.ScreenToMap(mousePos);
-
-            var foundSprites = new List<DMISpriteComponent>();
-            foreach (DMISpriteComponent sprite in screenOverlay.EnumerateScreenObjects()) {
-                Vector2 position = sprite.ScreenLocation.GetViewPosition(viewOffset, EyeManager.PixelsPerMeter);
-
-                if (sprite.CheckClickScreen(position, coords.Position)) {
-                    foundSprites.Add(sprite);
-                }
-            }
-
-            if (foundSprites.Count == 0)
+            Color lookupColor = _dreamViewOverlay.MouseMap.GetPixel((int)mousePos.X, (int)mousePos.Y);
+            if(!_dreamViewOverlay.MouseMapLookup.TryGetValue(lookupColor, out EntityUid result))
                 return null;
-
-            foundSprites.Sort(new RenderOrderComparer());
-            return foundSprites[^1].Owner;
+            return result;
         }
 
-        private EntityUid? GetEntityOnMap(MapCoordinates coords) {
-            IEnumerable<EntityUid> entities = _lookupSystem.GetEntitiesIntersecting(coords.MapId, Box2.CenteredAround(coords.Position, (0.1f, 0.1f)));
-
-            var foundSprites = new List<DMISpriteComponent>();
-            foreach (EntityUid entity in entities) {
-                if (_entityManager.TryGetComponent<DMISpriteComponent>(entity, out var sprite)
-                    && sprite.CheckClickWorld(coords.Position)) {
-                    foundSprites.Add(sprite);
-                }
-            }
-
-            if (foundSprites.Count == 0)
-                return null;
-
-            foundSprites.Sort(new RenderOrderComparer());
-            return foundSprites[^1].Owner;
-        }
     }
 }

OpenDreamClient/Rendering/ClientAppearanceSystem.cs

@@ -4,6 +4,8 @@
 using SharedAppearanceSystem = OpenDreamShared.Rendering.SharedAppearanceSystem;
 using Robust.Client.Graphics;
 using Robust.Shared.Prototypes;
+using OpenDreamClient.Resources;
+using OpenDreamClient.Resources.ResourceTypes;
 
 namespace OpenDreamClient.Rendering {
     sealed class ClientAppearanceSystem : SharedAppearanceSystem {
@@ -19,6 +21,7 @@ sealed class ClientAppearanceSystem : SharedAppearanceSystem {
 
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly OccluderSystem _occluderSystem = default!;
+        [Dependency] private readonly IDreamResourceManager _dreamResourceManager = default!;
 
         public override void Initialize() {
             SubscribeNetworkEvent<AllAppearancesEvent>(OnAllAppearances);
@@ -96,14 +99,27 @@ public void CleanUpUnusedFilters() {
             }
         }
 
-        public ShaderInstance GetFilterShader(DreamFilter filter) {
+        public ShaderInstance GetFilterShader(DreamFilter filter, Dictionary<string, IRenderTexture> renderSourceLookup) {
             if (!_filterShaders.TryGetValue(filter, out var instance)) {
                 var protoManager = IoCManager.Resolve<IPrototypeManager>();
 
                 instance = protoManager.Index<ShaderPrototype>(filter.FilterType).InstanceUnique();
 
                 switch (filter) {
                     case DreamFilterAlpha alpha:
+                        if(!String.IsNullOrEmpty(alpha.RenderSource) && renderSourceLookup.TryGetValue(alpha.RenderSource, out var renderSourceTexture))
+                            instance.SetParameter("mask_texture", renderSourceTexture.Texture);
+                        else if(alpha.Icon != 0){
+                            _dreamResourceManager.LoadResourceAsync<DMIResource>(alpha.Icon, (DMIResource rsc) => {
+                                    instance.SetParameter("mask_texture", rsc.Texture);
+                                });
+                        }
+                        else{
+                            instance.SetParameter("mask_texture", Texture.Transparent);
+                        }
+                        instance.SetParameter("x",alpha.X);
+                        instance.SetParameter("y",alpha.Y);
+                        instance.SetParameter("flags",alpha.Flags);
                         break;
                     case DreamFilterAngularBlur angularBlur:
                         break;
@@ -114,15 +130,8 @@ public ShaderInstance GetFilterShader(DreamFilter filter) {
                         break;
                     case DreamFilterColor color: {
                         //Since SWSL doesn't support 4x5 matrices, we need to get a bit silly.
-                        instance.SetParameter("colorMatrix", new Matrix4(
-                            color.Color.c11, color.Color.c12, color.Color.c13, color.Color.c14,
-                            color.Color.c21, color.Color.c22, color.Color.c23, color.Color.c24,
-                            color.Color.c31, color.Color.c32, color.Color.c33, color.Color.c34,
-                            color.Color.c41, color.Color.c42, color.Color.c43, color.Color.c44
-                            ));
-                        instance.SetParameter("offsetVector", new Vector4(
-                            color.Color.c51, color.Color.c52, color.Color.c53, color.Color.c54
-                            ));
+                        instance.SetParameter("colorMatrix", color.Color.GetMatrix4());
+                        instance.SetParameter("offsetVector", color.Color.GetOffsetVector());
                         //TODO: Support the alternative colour mappings.
                         break;
                     }

OpenDreamClient/Rendering/DMISpriteComponent.cs

@@ -35,9 +35,8 @@ public Box2 GetAABB(Transform transform) {
             return Icon.GetWorldAABB(transform.Position);
         }
 
-        public bool IsVisible(bool checkWorld = true, [CanBeNull] IMapManager mapManager = null) {
-            if (Icon?.DMI == null) return false;
-            if (Icon.Appearance.Invisibility > 0) return false; //TODO: mob.see_invisibility
+        public bool IsVisible(bool checkWorld = true, [CanBeNull] IMapManager mapManager = null, int seeInvis = 0) {
+            if (Icon.Appearance?.Invisibility > seeInvis) return false;
 
             if (checkWorld) {
                 //Only render movables not inside another movable's contents (parented to the grid)

OpenDreamClient/Rendering/DreamIcon.cs

@@ -188,7 +188,7 @@ public void Draw(DrawingHandleWorld handle, Vector2 position) {
 
             AtlasTexture frame = CurrentFrame;
             if (frame != null) {
-                handle.DrawTexture(frame, position, Appearance.Color); // TODO: Does not consider SillyColorFilter
+                handle.DrawTexture(frame, position, Appearance.Color); // TODO: Does not consider ColorMatrix
             }
 
             foreach (DreamIcon overlay in Overlays) {