jerome Posted November 16, 2015 Share Posted November 16, 2015 Hi, the last BJS commit https://github.com/BabylonJS/Babylon.js/commit/534f87a3f70c5264310185aa4d34db6801f06ae8just erased my former feature in CreateCylinder() in VertexData.ts (feature hasRings) https://github.com/jbousquie/Babylon.js/commit/2b4f2feaa601c5ab5c51f6360c959472525c9a92 And I have no idea how to get this feature back as I can't re-PR my branch to the core. Quote Link to comment Share on other sites More sharing options...
jerome Posted November 16, 2015 Author Share Posted November 16, 2015 Do I need to re-modify the VertexData file and re-submit it ? Quote Link to comment Share on other sites More sharing options...
jerome Posted November 16, 2015 Author Share Posted November 16, 2015 it seems some modifications on IcoSphere were changed also :-( Quote Link to comment Share on other sites More sharing options...
RaananW Posted November 16, 2015 Share Posted November 16, 2015 I am pretty sure DK will be abl to fix that :-)I will try following the commits as wella nd see how it can be amended. Quote Link to comment Share on other sites More sharing options...
jerome Posted November 16, 2015 Author Share Posted November 16, 2015 okso I'm waiting until it's fixed. I don't recode and don't re-submit. thank you Quote Link to comment Share on other sites More sharing options...
jerome Posted November 16, 2015 Author Share Posted November 16, 2015 my last commit optimizing ComputeNormals() was erased also :-( https://github.com/BabylonJS/Babylon.js/commit/8971e61102d97d5aee13455f633a25d73069d4f3 Quote Link to comment Share on other sites More sharing options...
jerome Posted November 16, 2015 Author Share Posted November 16, 2015 After investigations, the problem seems to be here : https://github.com/BabylonJS/Babylon.js/pull/821#issuecomment-157013819 Quote Link to comment Share on other sites More sharing options...
RaananW Posted November 16, 2015 Share Posted November 16, 2015 I don't get it... Your PR did that? Quote Link to comment Share on other sites More sharing options...
jerome Posted November 16, 2015 Author Share Posted November 16, 2015 Noooo... I don't explain well Check this please : https://github.com/BabylonJS/Babylon.js/commits/master As you can see on merge #819 and 821, I made 2 changes in the file VertexData.ts : optimized the function ComputeNormals() and added a feature to CreateCylinder(), called hasRings.These changes were correctly merged at this moment. If you check the next DK's commit ("Fixing cache issue for computeWorldMatrix"), you'll see that the ComputeNormals() optimization is then removed from VertexData.ts but the CreateCylinder() hasRings feature is still inside as it were just added. And the next commit then modifying the file VertexData.ts, called "Cleaning code for PBR" removes the hasRings feature. So these two commits removed in turn what I PRed last friday. Quote Link to comment Share on other sites More sharing options...
RaananW Posted November 16, 2015 Share Posted November 16, 2015 Ah!ok. Checking :-) Quote Link to comment Share on other sites More sharing options...
RaananW Posted November 16, 2015 Share Posted November 16, 2015 So the missing are 819 and 821? Quote Link to comment Share on other sites More sharing options...
RaananW Posted November 16, 2015 Share Posted November 16, 2015 I am merging the changes manually in a few minutes. Quote Link to comment Share on other sites More sharing options...
jerome Posted November 16, 2015 Author Share Posted November 16, 2015 ok,thank you so much I'll be able to extend the feature then Quote Link to comment Share on other sites More sharing options...
RaananW Posted November 16, 2015 Share Posted November 16, 2015 Merged, should be updated in the master now.But now it created a conflict with a different PR :-) Oh man....Let's see how to fix that. Quote Link to comment Share on other sites More sharing options...
jerome Posted November 16, 2015 Author Share Posted November 16, 2015 git hell ! Quote Link to comment Share on other sites More sharing options...
RaananW Posted November 16, 2015 Share Posted November 16, 2015 git is wonderful! Gotta love it... Quote Link to comment Share on other sites More sharing options...
jerome Posted November 16, 2015 Author Share Posted November 16, 2015 Ok, the VertexData.ts seems to be right backThank you Raanan Quote Link to comment Share on other sites More sharing options...
GameMonetize Posted November 16, 2015 Share Posted November 16, 2015 Thanks Raanan!! Don't know what happened here :0 Quote Link to comment Share on other sites More sharing options...
RaananW Posted November 16, 2015 Share Posted November 16, 2015 All good :-) Quote Link to comment Share on other sites More sharing options...
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.
Note: Your post will require moderator approval before it will be visible.