Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Item drops 3D! #633

Merged
merged 6 commits into from
Jul 24, 2024
Merged

Conversation

Captainkittyca2
Copy link
Contributor

@Captainkittyca2 Captainkittyca2 commented Jun 1, 2024

Adds a toggle-able feature within Enhancements->Graphics to make Item drops 3D and spin. Most of the code is handled within a hook function in 3DItemDrops.cpp file

Build Artifacts

@Caladius
Copy link
Contributor

Caladius commented Jun 1, 2024

Using kafeis cpp file is a no no lol. You'll need to create your own cpp and h file following the other enhancement examples and self contain your code within it.

@Captainkittyca2
Copy link
Contributor Author

Using kafeis cpp file is a no no lol. You'll need to create your own cpp and h file following the other enhancement examples and self contain your code within it.

But It's within its own functions. I left the kafei functions untouched

@Caladius
Copy link
Contributor

Caladius commented Jun 1, 2024

Each enhancement needs it's own separate file.

@Captainkittyca2
Copy link
Contributor Author

Each enhancement needs it's own separate file.

Alright, I'll make a h and cpp file for it

@Captainkittyca2
Copy link
Contributor Author

Alright, added two files

Copy link
Contributor

@garrettjoecox garrettjoecox left a comment

Choose a reason for hiding this comment

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

You should be able to pull this off without touching the actor’s file at all using the actor update & actor init hooks

@Captainkittyca2
Copy link
Contributor Author

You should be able to pull this off without touching the actor’s file at all using the actor update & actor init hooks

Ah I'm not familiar with those tbh.

@garrettjoecox garrettjoecox added the enhancement New feature or request label Jun 2, 2024
@garrettjoecox
Copy link
Contributor

Updated to use generic hooks & a few other tweaks

@garrettjoecox garrettjoecox mentioned this pull request Jun 4, 2024
31 tasks
@Archez
Copy link
Contributor

Archez commented Jul 13, 2024

I've updated this PR with latest develop and applied some fixes/changes:

  • Add rotation reset when disabling the enhancement so that bill-boarded sprites face the camera correctly.
  • Refined which items should get the custom spin applied. Some where getting double rotation.
  • Huge rupees weren't using the huge rupee model.
  • Rupee scales are adjusted to match SoH.
  • Removal of the rupee model gfx patch. This was impacting rupees from chests and in theory would not work with custom models.

If we wanted to render just the inner part of these rupees, we should setup new custom GID draw methods that just render the inner rupee part, but I don't think that is required for the scope of this PR.

Copy link
Contributor

@Archez Archez left a comment

Choose a reason for hiding this comment

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

LGTM 👍 Thanks to everyone who worked on this!
A good example of taking something from SoH, but porting it into hooks.

The changes for the slime actor in my opinion are fine as is, as we don't really have a good pattern for pulling something like that out.

@Archez Archez merged commit 51af064 into HarbourMasters:develop Jul 24, 2024
5 checks passed
mckinlee pushed a commit to mckinlee/2ship2harkinian that referenced this pull request Oct 4, 2024
* Initial 3D Item Drops Toggle

* Use generic hooks and other tweaks

* 3d drop fixes and changes

* move slime item draw to VB hook; fix arrow GID

* whitespacing

---------

Co-authored-by: Garrett Cox <[email protected]>
Co-authored-by: Archez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants