Skip to content

Dissection task and bug fixes#872

Merged
eamathie merged 14 commits intodevelopfrom
DissectionTask
May 30, 2025
Merged

Dissection task and bug fixes#872
eamathie merged 14 commits intodevelopfrom
DissectionTask

Conversation

@eamathie
Copy link
Contributor

@eamathie eamathie commented May 29, 2025

  • What kind of change does this PR introduce?

    • Feature and bug fixes
  • What is the current behavior?

  • What is the new behavior?

    • The salmon dissection task is fully functioning, with task structures for the tablet, a dissection system, and a mesh highlight system, and a new salmon 3D model for the dissection task
    • NPCs tend to stand rigidly still a lot less
    • The NPC's exit and skip line buttons now show up
    • Duplicate salmon no longer spawn in the laboratory when scene resets
  • Does this PR introduce a breaking change?

    • Unlikely, but there are changes to the NPCs which may cause minor conflicts with the AI NPC branch.
  • Other information?

    • I removed the step of requiring the fish cage (fishmerd) model in README.md

eamathie and others added 14 commits April 24, 2025 15:46
- A path of arrows is displayed on the salmon's side.
- This path highlights where the incision is to be made.
- It gradually fills with colour as the player cuts along path.
- Salmon object is swapped when moving to the next dissection step.
- The dissected state currently has placeholder cubes for intestines

Refs: #847
- Implemented cell shading/outline by duplicating and inverting mesh
- Should work on "any" mesh, but must be optimized a bit.
- Figured out how to make objects pointable with UI pointers.
- This triggers a new version of tooltips for organs.

Refs: #847
- It now iterates through vertices in chunks.
- Prevents stalling due to iterating through hundreds of them.
- It will still lag if this script is placed on many detailed objects.
- But that is not the indended usecase.

Refs: #847
- NPC will now walk to cutting board and start dissection dialogue.
- He reacts when salmon is placed on cutting board and dissected.
- Placeholder dialogue for now.
- Refactored and moved dissection related files into their own folder.

Refs: #847, #862
- The model of the salmon dissected
- The textures of the inside part of the salmon
- The animations of the salmon

Refs: #862
- Created animation clips for blend shapes.
- Started implementing NPC behaviour and dialogue for dissection.
- Removed line that resets index in DialogueBoxController.
- That was necessary to return to correct index in dialogue.

Refs: #862
- Ended up manually moving BlendShapes in code.
- Highlights do not show from behind other objects, need workaround.
- Experimenting with making non-highlighted organs transparent.
- This exposes the inaccurate 3d sorting of transparent objects.
- Will figure out a workaround for this.

Refs: #847, #862
- Highlight instead of outline bypasses depth sorting problems.
- Regenerates collider and highlight mesh after animation to match mesh.
- Much more visible for the user.

Refs: #847
- Code assumes incorrect answers lead to a set index.
- Laser pointers are now blocked when NPC highlights organs.

Refs: #847, #862
- The dissection task is now playable, but lacks tablet structures.
- The problem where NPCs stand still happens less often.
- "All" organs now have labels when highlighted by laser pointer.
- Scalpel respawns when dropped on the floor.
- Fixed a bug where duplicate salmon appeared.

Refs: #862, #847, #867, #868, #869
- Tasks, subtasks, steps, skills, dialogue, are all working.
- Task resets properly.

Refs: #862
- dissection task is now marked as completed after all steps.

Refs: #862
Copy link
Contributor

@OlaBekkevold OlaBekkevold left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything works as it should. But I discovered that if you try to start a task in the laboratory while the NPC is already standing at it's destination for the task, the NPC will just restart the dialogue and the task never starts. But this is probably a general issue and not specific to this pull request.

@eamathie eamathie merged commit aab935b into develop May 30, 2025
1 check failed
@eamathie eamathie deleted the DissectionTask branch May 30, 2025 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3D model content bug Something isn't working enhancement New feature or request

Projects

None yet

3 participants