Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
SRB2
SRB2
  • Project
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 265
    • Issues 265
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 72
    • Merge Requests 72
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • STJr
  • SRB2SRB2
  • Merge Requests
  • !1031

Merged
Opened Jul 03, 2020 by Hannu Hanhi@Hannu_Hanhi 
  • Report abuse
Report abuse

MF2_LINKDRAW support for OpenGL

Adds MF2_LINKDRAW support for sprite drawing in OpenGL. That fixes Tails's tails appearing in front of the shields and makes GFZ3's laser more accurate to the software renderer.

The drawing order is adjusted and the z-buffer writes of the linkdraw sprites are postponed to the end of sprite drawing so sprites drawn afterwards will be on top even if the real sprite location differs.

Drop shadow rendering also had to be adjusted for correct appearance.

The implementation can be simplified once the renderer is changed to draw all transparent surfaces and sprites together back to front instead of the current code where they are drawn separately.

srb20176

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://git.do.srb2.org/Hannu_Hanhi/SRB2.git ogl-linkdraw
git checkout -b Hannu_Hanhi/SRB2-ogl-linkdraw FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout next
git merge --no-ff Hannu_Hanhi/SRB2-ogl-linkdraw

Step 4. Push the result of the merge to GitLab

git push origin next

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 3
  • Commits 3
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Zwip-Zwap Zapony @Zwip-Zwap_Zapony commented Jul 03, 2020

    Merge conflicts already? :dramahog:

    Merge conflicts already? :dramahog:
  • Hannu Hanhi @Hannu_Hanhi

    added 80 commits

    • b29873ce...de8019f1 - 79 commits from branch STJr:next
    • b4aa5cec - Merge remote-tracking branch 'upstream/next' into ogl-linkdraw

    Compare with previous version

    Jul 05, 2020

    added 80 commits

    • b29873ce...de8019f1 - 79 commits from branch STJr:next
    • b4aa5cec - Merge remote-tracking branch 'upstream/next' into ogl-linkdraw

    Compare with previous version

    added 80 commits <ul><li>b29873ce...de8019f1 - 79 commits from branch <code>STJr:next</code></li><li>b4aa5cec - Merge remote-tracking branch &#39;upstream/next&#39; into ogl-linkdraw</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/1031/diffs?diff_id=5846&start_sha=b29873ce1c6c6b492da530ec0184243f9a8afa16)
    Toggle commit list
  • Hannu Hanhi @Hannu_Hanhi commented Jul 05, 2020

    Merge conflict should be fixed now.

    Merge conflict should be fixed now.
  • Hannu Hanhi @Hannu_Hanhi

    added 27 commits

    • b4aa5cec...b442b5a9 - 26 commits from branch STJr:next
    • 5fdc4578 - Merge remote-tracking branch 'upstream/next' into ogl-linkdraw

    Compare with previous version

    Jul 10, 2020

    added 27 commits

    • b4aa5cec...b442b5a9 - 26 commits from branch STJr:next
    • 5fdc4578 - Merge remote-tracking branch 'upstream/next' into ogl-linkdraw

    Compare with previous version

    added 27 commits <ul><li>b4aa5cec...b442b5a9 - 26 commits from branch <code>STJr:next</code></li><li>5fdc4578 - Merge remote-tracking branch &#39;upstream/next&#39; into ogl-linkdraw</li></ul> [Compare with previous version](https://git.magicalgirl.moe/STJr/SRB2/merge_requests/1031/diffs?diff_id=5893&start_sha=b4aa5cecc172ed9015a5cbdee2ac278f96dd8c9f)
    Toggle commit list
  • Hannu Hanhi @Hannu_Hanhi commented Jul 10, 2020

    Fixed merge conflict again

    Fixed merge conflict again
  • James R. @james

    merged

    Jul 12, 2020

    merged

    merged
    Toggle commit list
  • James R. @james

    mentioned in commit 6c366381

    Jul 12, 2020

    mentioned in commit 6c366381

    mentioned in commit 6c3663812b743131c43456f6074b276c423ffdb6
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: STJr/SRB2!1031
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.