Ogre 1.10 fork on github

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.
paroj
OGRE Team Member
OGRE Team Member
Posts: 542
Joined: Sun Mar 30, 2014 2:51 pm
x 76
Contact:

Re: Ogre 1.10 stable fork on github

Post by paroj » Mon Jan 18, 2016 1:45 am

the GLES2 RS is now running on Desktop GL using the ES Context. This allows to make a comparison GL vs GL3Plus vs GLES2:
https://ogrecave.github.io/ogre/gl_status/
0 x

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

Re: Ogre 1.10 stable fork on github

Post by paroj » Tue Jan 26, 2016 12:45 am

If you are interested what the differences between the bitbucket and the github version are, see here:
https://github.com/OGRECave/ogre/blob/m ... angeLog.md
0 x

frostbyte
Orc Shaman
Posts: 737
Joined: Fri May 31, 2013 2:28 am
x 14

Re: Ogre 1.10 stable fork on github

Post by frostbyte » Fri Jan 29, 2016 9:53 pm

omg- evil commits on main-stream default-branch broke hydrax, crippeled ogitor and cost me 2 days work...
on ogreFrustrum enableReflection... @depriciated means old code is left for backward compability, whats the point of redirecting to the new buggy code?
i'm starting using this fork...
please consider adding paroj to the ogre-team- i feel he has a lot to offer at least for ogre1.10( which will probably stay with us for the next couple of years )
obviously he has the skills, motivation, and maturaty( responsible unbiased etc... )
ogre team now seems to actualy have only 3 active people...and one of them is superbz with ogre 2.1...

btw it will be super extra cool and a big time saver if we can download the artifacts from the cl-builds- instead of building...
thanks...
0 x
the woods are lovely dark and deep
but i have promises to keep
and miles to code before i sleep
and miles to code before i sleep..

coolest videos link( two minutes paper )...
https://www.youtube.com/user/keeroyz/videos

User avatar
mkultra333
Gold Sponsor
Gold Sponsor
Posts: 1806
Joined: Sun Mar 08, 2009 5:25 am
x 8

Re: Ogre 1.10 stable fork on github

Post by mkultra333 » Mon Feb 01, 2016 5:27 am

I plan to upgrade to 1.10 in the near future, so I definitely want to see it maintained.

Thanks for the work, paroj.
0 x
"In theory there is no difference between practice and theory. In practice, there is." - Psychology Textbook.

User avatar
c6burns
Beholder
Posts: 1511
Joined: Fri Feb 22, 2013 4:44 am
Location: Deep behind enemy lines

Re: Ogre 1.10 stable fork on github

Post by c6burns » Mon Feb 01, 2016 6:11 am

Am I the only one seeing this fork as a bad thing (not paroj's work itself, which is great, but the existence of a fork that gains popularity)? The whole "git vs hg" sentiment in this thread is a red herring. Who makes the decision on who becomes a team member, or who has rights over pushing to the source? Is there a decision to be made here? If made a team member, is paroj willing to work within the code versioning system chosen by the team? These are the questions that interest me. I've been around long enough to see projects get split apart by forks that begin exactly like this ... not saying that is what is happening, just saying it's giving me that itchy feeling. Doing nothing about this fork is not the right move. Doing nothing is how forks like this happen in the first place and contributors are left wondering where the fuck to put their contributions.
0 x

User avatar
Wolfmanfx
OGRE Team Member
OGRE Team Member
Posts: 1525
Joined: Fri Feb 03, 2006 10:37 pm
Location: Austria - Leoben
x 1
Contact:

Re: Ogre 1.10 stable fork on github

Post by Wolfmanfx » Mon Feb 01, 2016 8:38 pm

I do not have a problem with his fork. Thats the great thing about opensource you can take it, fork it and transform into the shape you like it.
What paroj does in his fork is ok and why not he likes to refactoring.
But the refactoring are a way to massive we need to sort the the bad merge from simigon and clean up the repo and than 1.10 will be done (with 4-5 extra things) - we will provide LTS for it.
Also our focus is 2.X its already in a good shape and needs some mobile love and some features here and there but its the future (Metal, Vulkan,...)

But to clear one thing I do not have to like it, what he does or how he does it nor we are not in a situation where somebody is taking over a project.

Anyway thumbs up for paroj providing us with PR which are all in my pipeline (to review) I am reviewing all of them - but as you guys know David and I got babies which need love, care and time :) also Matias is pretty busy
with his awesome new game you should check it out ;) , so things slowed down.

Just you guys there is no offence to anybody!

Peace out ;)
0 x

User avatar
Thyrion
Goblin
Posts: 224
Joined: Wed Jul 31, 2013 1:58 pm
Location: germany

Re: Ogre 1.10 stable fork on github

Post by Thyrion » Mon Feb 01, 2016 9:27 pm

Wolfmanfx wrote:also Matias is pretty busy
with his awesome new game you should check it out ;) , so things slowed down.
I would if i could!
where is it? what is it? :)
0 x

frostbyte
Orc Shaman
Posts: 737
Joined: Fri May 31, 2013 2:28 am
x 14

Re: Ogre 1.10 stable fork on github

Post by frostbyte » Mon Feb 01, 2016 10:30 pm

matias's game https://twitter.com/AllianceAirWar

i also don't see a problem with this fork...( although i do wish it was a direct fork sharing same repository... )
i will alway be loyal to the main branch and forever grateful to all contributers and maintainers, bless you, all comits even evil ones are sacred...
like murat said- this fork mainly represent 3 major changes to the main branch( called 1.10-unstable for a reason... )
1)it is like a stable-1.10 branch( aka LTS ) with backward compatibility to 1.9( which makes porting massive projects much easier.. )
2)it's supposed to have better mobile support( building ios is fixed, commits only reviewed on dx11 are pulled out..., opengl unified etc... )
3)CI integration...indeed a neccessirty...i think this is the main reason for paroj choosing github - i guess that's the tools he already knew how to use...

murat has a good point, ogre-2.1 is the "not so far" future
so it would be great if it will recieve the proper attention/attraction/tools/whatever it needs to be the best...

with one cute toddler... then two...hopefully three...things will only get slower( on ogre's side... ) and anyway you guy have already have your names carved in Ogres "hall of eternal fame", thats why i think others should also step-in if they wish, not instead of but in addition-to...extra juce...just my opinion....

PEACE IN...
0 x
the woods are lovely dark and deep
but i have promises to keep
and miles to code before i sleep
and miles to code before i sleep..

coolest videos link( two minutes paper )...
https://www.youtube.com/user/keeroyz/videos

User avatar
c6burns
Beholder
Posts: 1511
Joined: Fri Feb 22, 2013 4:44 am
Location: Deep behind enemy lines

Re: Ogre 1.10 stable fork on github

Post by c6burns » Tue Feb 02, 2016 1:59 am

Wolfmanfx wrote: Anyway thumbs up for paroj providing us with PR which are all in my pipeline (to review) I am reviewing all of them - but as you guys know David and I got babies which need love, care and time :) also Matias is pretty busy
with his awesome new game you should check it out ;) , so things slowed down.
Cool, I know how that is! Good luck and thanks to all who put their time into maintaining Ogre
frostbyte wrote:i also don't see a problem with this fork...( although i do wish it was a direct fork sharing same repository... )
There's no problem with this specific fork, but forks can become a problem over time. But yeah, yeah same here on the repo front / repo war junk. But paroj's fork, paroj's choice :lol: This is clearly the best code for new users targeting mobile right now, or even users in later stages of production with 1.9 who want a painless bump to 1.10
0 x

User avatar
dark_sylinc
OGRE Team Member
OGRE Team Member
Posts: 3664
Joined: Sat Jul 21, 2007 4:55 pm
Location: Buenos Aires, Argentina
x 109
Contact:

Re: Ogre 1.10 stable fork on github

Post by dark_sylinc » Tue Feb 02, 2016 8:42 pm

Murat pretty much summarized my line of thought.

I'm also ok with a fork. That's the beauty of Open Source. If you don't like the direction, you can move and start your own.

However paroj is still actively contributing back and personally I think it's awesome his fork keeps getting in sync and works as a playtest of "what happens if the PR gets merged?" with automated testing checking if it compiles everywhere.

We're also getting to see the "what if" if we would have taken a different route, particularly not merging a controversial PR.

Murat and I are looking into reverting that commit. It's causing far more headaches than anything.
Thyrion wrote:
Wolfmanfx wrote:also Matias is pretty busy
with his awesome new game you should check it out ;) , so things slowed down.
I would if i could!
where is it? what is it? :)
Alliance AirWar.
It's an iPhone/iPad game running on Metal. It's not running on Ogre so I couldn't advertise it here with its own post, though we reused a lot of Ogre components: Math, ParticleFX plugin (revamped for performance and memory usage to suite our needs), some of the Ribbon Trail math, the code to convert meshes in to 16-bit floating point and normals into QTangents, Offline Hlms shader generation (to deal with all the feature permutations).
0 x

User avatar
Wolfmanfx
OGRE Team Member
OGRE Team Member
Posts: 1525
Joined: Fri Feb 03, 2006 10:37 pm
Location: Austria - Leoben
x 1
Contact:

Re: Ogre 1.10 stable fork on github

Post by Wolfmanfx » Tue Feb 02, 2016 8:59 pm

@pavel

I like what you did with the tests and the CI maybe you want help me todo the same for our repo?
0 x

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

Re: Ogre 1.10 stable fork on github

Post by paroj » Tue Feb 09, 2016 7:56 pm

to clear some things up: the git vs. hg discussion is not the driving force behind the fork.
I chose git because of github because of the Travis CI integration which is really the backbone of my CI efforts.
It reliably handles the iOS/ OSX/ Linux and Android builds which you can not say about Appveor which regularly manages to timeout the MSVC build.

What really drove me to call my efforts a fork is the mentioned controversial PR (originally #555): it was immediately noted by me and by others that this would
cause trouble, but it was merged nevertheless.

I really appreciate that Murat reviews each of my commits before they get pulled, however it is rather pointless if others just merge huge changes without
even thinking about it.

It was the right thing to back out #588 - however there were also many bad commits in #579, and the GL crashing after #580 is still there AFAIK.
But now that you merged #562 on top of everything resolving this with hg will be pain..

Regarding CI, here you go: https://bitbucket.org/paroj/ogre/commit ... at=default
but as I said above; what you really want is Travis..
0 x

User avatar
Wolfmanfx
OGRE Team Member
OGRE Team Member
Posts: 1525
Joined: Fri Feb 03, 2006 10:37 pm
Location: Austria - Leoben
x 1
Contact:

Re: Ogre 1.10 stable fork on github

Post by Wolfmanfx » Tue Feb 09, 2016 8:02 pm

I think you missread the hg log - we took the steps and went back in the hg history to a commit which is safe and from this commit Eugene cherry picked the good parts and merged his work.
So all the bad things will go away - also I did not merged Eugene's work it was Eugene our newest team member :)
0 x

User avatar
Zonder
Gargoyle
Posts: 1088
Joined: Mon Aug 04, 2008 7:51 pm
Location: Manchester - England
x 5

Re: Ogre 1.10 stable fork on github

Post by Zonder » Wed Feb 10, 2016 9:32 am

Wolfmanfx wrote:Eugene our newest team member :)
The team page could do with updating on the main site ;)
0 x
There are 10 types of people in the world: Those who understand binary, and those who don't...
My Blog - http://www.This post is suspected as SPAM! If you feel otherwise contact a moderator.

User avatar
Zonder
Gargoyle
Posts: 1088
Joined: Mon Aug 04, 2008 7:51 pm
Location: Manchester - England
x 5

Re: Ogre 1.10 stable fork on github

Post by Zonder » Wed Feb 10, 2016 9:42 am

I think this fork has proved the github eco system is better for the project. I think if anything did move it should only be 2.1+ though.
0 x
There are 10 types of people in the world: Those who understand binary, and those who don't...
My Blog - http://www.This post is suspected as SPAM! If you feel otherwise contact a moderator.

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

Re: Ogre 1.10 stable fork on github

Post by paroj » Wed Feb 10, 2016 10:16 am

Wolfmanfx wrote:I think you missread the hg log - we took the steps and went back in the hg history to a commit which is safe and from this commit Eugene cherry picked the good parts and merged his work.
yes, I indeed misread the log. Eugene went back to the same commit the github fork is based on, so I will try to rebase the github version on what is in default now.
0 x

User avatar
Wolfmanfx
OGRE Team Member
OGRE Team Member
Posts: 1525
Joined: Fri Feb 03, 2006 10:37 pm
Location: Austria - Leoben
x 1
Contact:

Re: Ogre 1.10 stable fork on github

Post by Wolfmanfx » Wed Feb 10, 2016 10:34 am

@Zonder right now I am working on the new website...
0 x

User avatar
dark_sylinc
OGRE Team Member
OGRE Team Member
Posts: 3664
Joined: Sat Jul 21, 2007 4:55 pm
Location: Buenos Aires, Argentina
x 109
Contact:

Re: Ogre 1.10 stable fork on github

Post by dark_sylinc » Wed Feb 10, 2016 6:06 pm

Zonder wrote:
Wolfmanfx wrote:Eugene our newest team member :)
The team page could do with updating on the main site ;)
He's been a team member for 2 days :)
And... oh yeah. We'll be updating the website soon. So far Murat's been doing most of the work :oops:
0 x

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

Re: Ogre 1.10 stable fork on github

Post by paroj » Sun Feb 14, 2016 1:36 am

Eugene has been doing a great job so far. I have rebased my fork on current default and created PRs as appropriate.

I have however not created PRs for
  1. remove dependency on OIS for SampleBrowser/ Tests and use SDL2 instead if available
  2. GLSupport module that can create GLES contexts everywhere
because I assume Murat would not merge that. If I am wrong I can still provide those
0 x

User avatar
Wolfmanfx
OGRE Team Member
OGRE Team Member
Posts: 1525
Joined: Fri Feb 03, 2006 10:37 pm
Location: Austria - Leoben
x 1
Contact:

Re: Ogre 1.10 stable fork on github

Post by Wolfmanfx » Tue Feb 16, 2016 11:28 am

Hi,

2 can be relevant. 1 was not complete as I remember (mobile were missing) or I am wrong?
0 x

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

Re: Ogre 1.10 stable fork on github

Post by paroj » Sun Feb 21, 2016 5:55 pm

created pull requests for both.

however both need more testing as they affect more platforms then I can test on my own (even with CI).
0 x

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

Re: Ogre 1.10 stable fork on github

Post by paroj » Sat Feb 27, 2016 11:05 pm

the github fork comes now with batteries included:
by default the core Ogre Dependencies are build: zlib, zzip, freetype. No need to mess with the ogredeps repro and as a bonus you get the latest upstream versions with all the security fixes.

furthermore the ubuntu build was updated from 12.04 to 14.04.
0 x

User avatar
Wolfmanfx
OGRE Team Member
OGRE Team Member
Posts: 1525
Joined: Fri Feb 03, 2006 10:37 pm
Location: Austria - Leoben
x 1
Contact:

Re: Ogre 1.10 fork on github

Post by Wolfmanfx » Sun Feb 28, 2016 9:58 am

To prevent further confusion I am closing this topic now.

You can check updates from the fork by following it if you like.

To conclude: paroj created a fork which is not an official one, but a personal fork which is not supported by the team.

For official versions, check this page http://www.ogre3d.org/about/what-version-to-choose

[Edit Comments]
Why I closed the topic?
As matias pointed out that ppl could take it personal. I will explain why:
+ We already stated that we are ok with forks (there hundreds out there)
+ I am not ok to start a thread as stable replacement and use this thread as dev blog (posting commit logs there) because its just not true. Imagaine 10 ppl start a thread
everybody states our fork is the stable one and starting posting their refactoring work - what user should think? Think of the newcomers.
0 x

Locked