Closed RobinReborn closed 4 years ago
Thanks so much for @RobinReborn , just as an update we are about to merge in #142 later tonight which may cause a lot of merge conflicts in your code so be prepared to rebase and resolve them.
OK - I've incorporated #142 and #150 into my code.
Sorry @RobinReborn You are going to need to do one last merge from master. We finally hammered out most of the remaining npm conversion issues. Thank you for your patience!
OK, I updated the .gitignore but I am still having problems with webgazer.js not being found like I had before (I'm running Chrome on Ubuntu).
The existing conflicts are mainly because I changed ridgeRegWeighted.js to be ridgeRegWeighted.mjs - I also added some things to the .gitignore so I wouldn't upload the data for webgazerExtract
I am guessing you are on Windows? That's probably the main issue since symlinks aren't enabled by default. A long term solution is probably to just install webgazer as a node dependency in www.
On Mon, Aug 10, 2020 at 6:02 PM Robin Gane-McCalla notifications@github.com wrote:
OK, I updated the .gitignore but I am still having problems with webgazer.js not being found like I had before (I'm running Chrome on Ubuntu).
The existing conflicts are mainly because I changed ridgeRegWeighted.js to be ridgeRegWeighted.mjs - I also added some things to the .gitignore so I wouldn't upload the data for webgazerExtract
— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/brownhci/WebGazer/pull/149#issuecomment-671612000, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAPVMX7DU65HMPAGTZPK2DDSABU6VANCNFSM4PX53PCQ .
No - I'm on Ubuntu. I just hadn't renamed webgazer.var.js to webgazer.js it's working now.
@RobinReborn Is this ready? Should the remaining conflicting files be dealt with?
It's ready now, I have dealt with the conflicting files.
So dist2/ folder needs to be removed from this commit and make sure no map files are committed.
OK - I've removed dist2/ and my dist/ file structure is the same as what's currently in master.
Please resolve the deletion conflict. dist/webgazer.commonjs2.js.map still needs to be removed. @RobinReborn Is the new .gitignore not working for you?
Went ahead and fixed it.
I merged the .gitignore after everything else, sorry about that.
Do you need any other changes from me?
@RobinReborn Looks like your refactor did break something. I got this error on P_01
webgazerExtractClient.js:359 Uncaught (in promise) TypeError: webgazer.getRegression(...)[0].getEyeFeats is not a function
at runWebGazerSendResult (webgazerExtractClient.js:359)
I have updated the code so that webgazerExtract works with facemesh.
I've made a few stylistic changes as well, separating larger files into multiple files, including separating HTMl from CSS and Javascript.
I've made getEyeFeats accessible outside of ridge regression.
I've also changed the names of the .csv files written, I considered deleting the images being written and just keeping the .csvs but I wasn't sure if there was a purpose in storing the images.