Ogre 2 and Ogre 1 merge strategy

Discussion area about developing or extending OGRE, adding plugins for it or building applications on it. No newbie questions please, use the Help forum for that.
Post Reply
User avatar
altren
Gnome
Posts: 316
Joined: Tue Oct 24, 2006 9:02 am
Location: Moscow, Russa
Contact:

Ogre 2 and Ogre 1 merge strategy

Post by altren » Sun Jan 13, 2019 9:55 pm

I'm doing some fixes that can hit anyone using both ogre 1.x and 2.x and I see that some of them can be applied to the 2.x as well.
Also, I looked through the repository log and it seems that these branches have diverged a long time ago.
So my question is is there any plans to merge 1.x into 2.x? Should I do two pull requests, if they are good for both branches?
0 x
Image

User avatar
altren
Gnome
Posts: 316
Joined: Tue Oct 24, 2006 9:02 am
Location: Moscow, Russa
Contact:

Re: Ogre 2 and Ogre 1 merge strategy

Post by altren » Sun Jan 27, 2019 2:18 pm

@dark_sylinc, @paroj Any thoughts on this?
0 x
Image

paroj
OGRE Team Member
OGRE Team Member
Posts: 715
Joined: Sun Mar 30, 2014 2:51 pm
x 106
Contact:

Re: Ogre 2 and Ogre 1 merge strategy

Post by paroj » Mon Jan 28, 2019 12:36 am

as you have noted the two branches diverged too far by now to be merged - this leaves
Should I do two pull requests, if they are good for both branches?
as the only option.
0 x

User avatar
Ybalrid
Halfling
Posts: 75
Joined: Thu Jul 10, 2014 6:52 pm
Location: France
x 21
Contact:

Re: Ogre 2 and Ogre 1 merge strategy

Post by Ybalrid » Fri Feb 15, 2019 3:09 pm

paroj wrote:
Mon Jan 28, 2019 12:36 am
as you have noted the two branches diverged too far by now to be merged
Ogre 2.x is definitively a hard fork.

IMHO this is something the community should think about: Something should be done to simplify the transition between 1.11 to 2.x, and only have 1.x being there for legacy support. I know 2.x has still some missing features (e.g. Morph animations on v2 Items), that it's basic setup is more complex (has to setup a compositor and rendering node, can't just tell a camera to render to a viewport without it), and that Android support is a problem due to the GLES 2/3 RenderSystems.

As of now, between 1.x and 2.x it's a bit like having 2 separated projects that inherit from the same code-base, not just a new development branch for 2.x... Heck, the main development of each actually happens in separated "upstream" repositories (a git one on github, and an hg one on bitbucket), they just happen to have their respective v1 and v2 branches synced from time to time.
0 x
Ogre_glTF Ogre v2-1 GLTF2 loader : topic link github repo
BtOgre21 Fork of btOgre, for Ogre v2-1 : topic link github repo
OIS Current maintainer : Official repository
Annwvyn VR focused game engine using Ogre : https://github.com/Ybalrid/Annwvyn https://annwvyn.org/

User avatar
Zonder
Ogre Magi
Posts: 1127
Joined: Mon Aug 04, 2008 7:51 pm
Location: Manchester - England
x 19

Re: Ogre 2 and Ogre 1 merge strategy

Post by Zonder » Sat Feb 16, 2019 12:23 pm

They have different major versions for a reason.....

Would you expect Microsoft to merge windows 10 and 7 together?
0 x
There are 10 types of people in the world: Those who understand binary, and those who don't...

Post Reply