Client distinguish between eye and mob for drawing, context menu, and verbs#2477
Open
Ruzihm wants to merge 32 commits into
Open
Client distinguish between eye and mob for drawing, context menu, and verbs#2477Ruzihm wants to merge 32 commits into
Ruzihm wants to merge 32 commits into
Conversation
…g draw, context menu, verbs
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
ike709
reviewed
Dec 15, 2025
boring-cyborg
Bot
added
Client
wixoaGit
requested changes
Jan 13, 2026
Co-authored-by: wixoa <wixoag@gmail.com>
Ruzihm
commented
Jan 15, 2026
Contributor
Author
|
actually - one sec. z levels and mouse events are messed up when eye is a turf. edit: should be good now |
Contributor
Author
|
Setting eye to null will stop rendering - but since that's done by setting the eye position to be in nullspace, the viewport stops clearing the render target and you just get a frozen screen: Does this warrant a pull request to RT to add a viewport option to allow target clearing if there is no eye/the eye is in null space? |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
Author
|
I tried my best to merge the refcounting change to Connection.Eye. I noticed that there was a redundant ref management outside of the |
Contributor
Author
|
@wixoaGit I think this PR is good for another look when you get a moment |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
wixoaGit
requested changes
May 14, 2026
Comment on lines
+16
to
+17
| // Type = Client -> null | ||
| public ClientObjectReference EyeRef; |
Member
There was a problem hiding this comment.
Would ClientObjectReference? work better here than treating Client as null?
Comment on lines
+22
to
+37
| RefType eyeType = (RefType)buffer.ReadInt32(); | ||
| switch (eyeType) { | ||
| case RefType.Entity: | ||
| EyeRef = new(new NetEntity(buffer.ReadInt32())); | ||
| break; | ||
| case RefType.Turf: | ||
| int x = buffer.ReadInt32(); | ||
| int y = buffer.ReadInt32(); | ||
| int z = buffer.ReadInt32(); | ||
| EyeRef = new(new(x, y), z); | ||
| break; | ||
| default: | ||
| // null eye | ||
| EyeRef = new(); | ||
| break; | ||
| } |
Member
There was a problem hiding this comment.
I don't like having the process for DreamClientReference serialization in here. I'd rather this either be a helper method on DreamClientReference, use the serializer this method is given, or have this net message converted to an entity system event.
Comment on lines
+164
to
+181
| switch (eyeRef.Type) { | ||
| default: | ||
| _mobSightQuery.TryGetComponent(mob, out mobSight); | ||
| seeVis = mobSight?.SeeInvisibility ?? 127; | ||
| DrawNullEyeSprites(args, viewportSize, seeVis); | ||
| return; | ||
| case ClientObjectReference.RefType.Turf: | ||
| eyeCoords = new(new(eyeRef.TurfX, eyeRef.TurfY), new(eyeRef.TurfZ)); | ||
| _mobSightQuery.TryGetComponent(mob, out eyeSight); | ||
| break; | ||
| case ClientObjectReference.RefType.Entity: | ||
| var eyeUid = _entityManager.GetEntity(eyeRef.Entity); | ||
| if (!_xformQuery.TryGetComponent(eyeUid, out var eyeTransform)) | ||
| return; | ||
| eyeCoords = _transformSystem.GetMapCoordinates(eyeUid, eyeTransform); | ||
| _mobSightQuery.TryGetComponent(eyeUid, out eyeSight); | ||
| break; | ||
| } |
Member
There was a problem hiding this comment.
Could this be turned into IsNullEye, EyeCoords, and Sight helper properties on DreamClientEye? It should be reachable from Draw()'s args.Viewport.Eye.
Co-authored-by: wixoa <wixoag@gmail.com>
Co-authored-by: wixoa <wixoag@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a network message sent from the server to client to notify of mob/eye updates (currently, the client uses the attached entity which is ambiguous). I wasn't sure of a better way to accomplish this but am looking for feedback.
The client then uses this info to distinguish between eye/mob for context menu, drawing, and verbs.
Closes #1581
Closes #2081