[Closed] +ROLLSPRITES backport

Moderator: GZDoom Developers

+ROLLSPRITES backport

Postby Nash » Mon Sep 07, 2015 9:12 pm

This OpenGL-only feature from GLOOME will rotate the 2D sprite when the actor's roll is changed. Useful for smoke and fire sprites like in the Unreal Engine.This implementation is flawed, please see take 2
Last edited by Nash on Thu Oct 01, 2015 10:41 am, edited 3 times in total.
User avatar
Nash
 
 
 
Joined: 27 Oct 2003
Location: Kuala Lumpur, Malaysia
Github ID: nashmuhandes

Re: +ROLLSPRITES backport

Postby Major Cooke » Mon Sep 07, 2015 9:20 pm

Strange, I was able to fork GZDoom and ZDoom, it's just you need to use something like SourceTree to do it. If you need help in that department, let me know.
User avatar
Major Cooke
Do unto others as you would have unto you. Judge yourself first.
 
Joined: 28 Jan 2007

Re: +ROLLSPRITES backport

Postby Graf Zahl » Tue Sep 08, 2015 12:52 am

If you want to fork both, do it locally ('git pull') and then commit to an empty Github repo.
User avatar
Graf Zahl
Lead GZDoom Developer
Lead GZDoom Developer
 
Joined: 19 Jul 2003
Location: Germany

Re: +ROLLSPRITES backport

Postby Nash » Tue Sep 08, 2015 11:17 am

Graf Zahl wrote:If you want to fork both, do it locally ('git pull') and then commit to an empty Github repo.


I don't understand. Elaborate?
User avatar
Nash
 
 
 
Joined: 27 Oct 2003
Location: Kuala Lumpur, Malaysia
Github ID: nashmuhandes

Re: +ROLLSPRITES backport

Postby kevans91 » Tue Sep 08, 2015 11:27 am

Nash wrote:
Graf Zahl wrote:If you want to fork both, do it locally ('git pull') and then commit to an empty Github repo.


I don't understand. Elaborate?


Basically:

1.) clone the source zdoom and gzdoom repositories locally
2.) Create your own zdoom and gzdoom repositories on Github (not 'forked,' but as if they are your own)
3.) Push your local copies of zdoom and gzdoom to their respective new repositories
kevans91
 
Joined: 16 Sep 2014

Re: +ROLLSPRITES backport

Postby Nash » Tue Sep 08, 2015 11:29 am

I vaguely remember trying that earlier this year and the problem was when trying to send a PR to the official repos, it just didn't work (like the source trees were incompatible or something)... I'll try that again later, thanks for the tip.
User avatar
Nash
 
 
 
Joined: 27 Oct 2003
Location: Kuala Lumpur, Malaysia
Github ID: nashmuhandes

Re: +ROLLSPRITES backport

Postby kevans91 » Tue Sep 08, 2015 11:40 am

Nash wrote:I vaguely remember trying that earlier this year and the problem was when trying to send a PR to the official repos, it just didn't work (like the source trees were incompatible or something)... I'll try that again later, thanks for the tip.


Ahh, my apologies, that may entirely be intended behavior. I seem to recall now that when I've tried it in the past, Github would only let me issue pull requests for other repositories within the same 'family tree'. If that is the case, then I would probably "officially" (GitHub Official) fork the one that you intend to work on the most, and then do the above method for the other. Even if you can't actually submit a formal pull request, it will make things a whole lot easier as you can 'fetch' the latest copy of gzdoom and diff it.
kevans91
 
Joined: 16 Sep 2014

Re: +ROLLSPRITES backport

Postby Nash » Tue Sep 08, 2015 11:51 am

I found out that it indeed does not work before I read your post. :P Well I am still looking to do it with PRs so if anyone can assist me it would be much appreciated. Sending one PR at a time (first for ZDoom, then for GZDoom) doesn't make sense because the ZDoom portion doesn't do anything (merely just makes ZDoom not crash from the unknown +ROLLSPRITES flag name, no other functionality) so if let's say the ZDoom portion gets merged but then the GZDoom portion gets rejected, then one would have to revert the ZDoom portion which is just unnecessary workload.
User avatar
Nash
 
 
 
Joined: 27 Oct 2003
Location: Kuala Lumpur, Malaysia
Github ID: nashmuhandes

Re: +ROLLSPRITES backport

Postby phantombeta » Tue Sep 08, 2015 11:58 am

@Nash
Make a new branch in your existing GZDoom repo then rebase (or whatever is the name of the command...) it to ZDoom's master branch. Do your work as normal. When submitting the pull request, it should let you choose if you want to do it for GZDoom's repo or ZDoom's.
This is how I do pull requests for ZDoom.
User avatar
phantombeta
In the meadow of sinful thoughts, every flower's a perfect one
 
Joined: 02 May 2013
Location: The United Soviet Socialist Dictatorship of Hueland
Discord: phantombeta#2461
Github ID: Doom2fan
Operating System: Windows 10/8.1/8 64-bit
OS Test Version: No (Using Stable Public Version)
Graphics Processor: nVidia with Vulkan support

Re: +ROLLSPRITES backport

Postby Nash » Fri Sep 11, 2015 2:03 am

phantombeta wrote:@Nash
Make a new branch in your existing GZDoom repo then rebase (or whatever is the name of the command...) it to ZDoom's master branch. Do your work as normal. When submitting the pull request, it should let you choose if you want to do it for GZDoom's repo or ZDoom's.
This is how I do pull requests for ZDoom.


Can you give me step-by-step instructions using TortoiseGit. There are a billion things to click in the right-click menu and I'm just confused.
User avatar
Nash
 
 
 
Joined: 27 Oct 2003
Location: Kuala Lumpur, Malaysia
Github ID: nashmuhandes

Re: +ROLLSPRITES backport

Postby phantombeta » Fri Sep 11, 2015 2:20 am

I don't use TortoiseGit, so... *shrugs*
User avatar
phantombeta
In the meadow of sinful thoughts, every flower's a perfect one
 
Joined: 02 May 2013
Location: The United Soviet Socialist Dictatorship of Hueland
Discord: phantombeta#2461
Github ID: Doom2fan
Operating System: Windows 10/8.1/8 64-bit
OS Test Version: No (Using Stable Public Version)
Graphics Processor: nVidia with Vulkan support

Re: +ROLLSPRITES backport

Postby Major Cooke » Fri Sep 11, 2015 7:14 am

I suggest SourceTree. I can teach you how to use that.
User avatar
Major Cooke
Do unto others as you would have unto you. Judge yourself first.
 
Joined: 28 Jan 2007

Re: +ROLLSPRITES backport

Postby Tormentor667 » Fri Sep 11, 2015 8:09 am

Oh my god, this feature would be awesome
User avatar
Tormentor667
needs more detail
 
Joined: 16 Jul 2003
Location: Germany

Re: +ROLLSPRITES backport

Postby Nash » Fri Sep 11, 2015 8:41 am

Guess anyone who's interested in using this will just have to wait. The rules didn't say forum code submissions are forbidden so unless that rule changes (or unless someone can help me do it without installing additional software than I already have)... ¯\(°_o)/¯

EDIT: can I just send a pull request for GZDoom then. The ZDoom changes can be backported easily, it's just adding 1 line in actor.h and thingdef_data.cpp. Super trivial stuff.
User avatar
Nash
 
 
 
Joined: 27 Oct 2003
Location: Kuala Lumpur, Malaysia
Github ID: nashmuhandes

Re: +ROLLSPRITES backport

Postby Major Cooke » Fri Sep 11, 2015 9:26 am

https://github.com/rheit/zdoom/pull/377
https://github.com/coelckers/gzdoom/pull/27

Okay, that was quite a bit more/less difficult than I expected.

Nash, can I show you how?
User avatar
Major Cooke
Do unto others as you would have unto you. Judge yourself first.
 
Joined: 28 Jan 2007

Next

Return to Closed Feature Suggestions

Who is online

Users browsing this forum: No registered users and 1 guest