-
Notifications
You must be signed in to change notification settings - Fork 28
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
move libs/** submodules into source tree #284
Conversation
git-subtree-dir: libs/ff-core git-subtree-split: 301d02aacf4167a3527cc7d548de24f3850c5f57
git-subtree-dir: libs/ff-browser git-subtree-split: 159a6e97f43497807674737c297696859309964a
git-subtree-dir: libs/ff-three git-subtree-split: 6316e73d63b8b0eef03275e33b16053b8ff030c4
git-subtree-dir: libs/ff-ui git-subtree-split: cf490da31e02dc4f92bfecedd32b22e622a41ed5
git-subtree-dir: libs/ff-graph git-subtree-split: fda6c7a2a4b0f6133440752406f683372971b3d5
git-subtree-dir: libs/ff-scene git-subtree-split: 196a5661e1df8799c74506dacaf88bc32a67166a
Working on the follow-ups for #288, I want to update three.js to r0.160+, which breaks down quite a lot of things from the |
Do you have an example of another project that is managing folders like 30a5039? I'm all for moving the used code over, but I think the /lib organization makes it more obvious that these aren't Voyager libraries. But might feel otherwise if you have an example. |
It depends if you think of the If you don't consider them "Voyager code", it is better to show this and keep them as "vendors" in a separate folder. Either way it's OK for me, I'll edit the PR to cut off the folder rename if you think it better reflects the ownership of this code. |
I don't consider the ff-* code as Voyager's code. They were developed outside of the project and I believe are (or at least were) used by its developer in other projects. |
…oad through loadingManager
I dropped the commit that moved everything to |
Working on merging this in now. Some of it seems like preference, but I'm ok with it. Still need to do a little testing, but the main issue I'm seeing right now is that a lot of the library cleanup you did doesn't seem to be coming through when I pull this branch. Something to do with removing that last commit? There are also a few ff-* file updates for this next release so not sure those will get merged in appropriately... |
Glad if you like it, there is clearly some subjective choices in here. The submodules removal uses exotic merges that should come through cleanly but they might not. I don't know how a reference change introduced in a previous commit would get handled. Do you have a working branch where I could get a look ? You just merged this branch over |
I hadn't yet because I was unsure how to merge the other ff-* library updates I made, but I can just redo them. I will merge with rc-43 tomorrow and let you know. |
https://github.com/Smithsonian/dpo-voyager/tree/dev-cleanup seems to somehow be missing the moving of the ff-* libs |
I think I was able to reproduce, using "master", merging my branch fails with a bunch of "existing files would be removed". Looks like you have to run |
Ok, thanks. I'll give that a try locally. My usual release process is to merge the RC with Master through Github, but sounds like that may not work here. If so, I may do this commit last (or separately). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sdumetz FYI loadingManager support in getText() was commented out in release v0.43.0. The loading spinner is tied to the manager status and users found it annoying when navigating tours with articles that the spinner would flash every time and article came up. Would be great to maintain consistency but this needs a little more thought from a UX standpoint.
Hi,
This PR contains a lot of changes I wish to do to try to clean up duplicate/unused/unpractical code but most of those are mostly independant from each-other. It should be seen primarily as a pool of ideas, of which any number can be merged.
I tried to make readable commit messages but just to give a quick summary :
libs/**
folder to be checked-out in the repository.ff-*
suite (left real tests untouched)libs/**
tosource/**
fetch.{text,json,file}
referencesfetch
's defaults (which was already used in most place).