-
Notifications
You must be signed in to change notification settings - Fork 770
Removes opencv dependency #361
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
Conversation
fixed compilation; fixed segfaults in CpuDepthPacketProcessor; disabled timing
@larshg OK if I merge this one instead of your original PR? Your contributions are still part of the commit log, of course. |
41fcadc
to
45e524e
Compare
I squashed some changes into larshg's commit for standardizing the timer and the inclusion of the opencv header. |
Wouldn't it be better to remove the opencv dependency for good? |
07cc598
to
33b4dfe
Compare
@floe sure, as I don't have much time right now it's nice someone continues the work :-) |
Removed opencv dependency, the only problem would be |
Could you add division by 4500.0f in the grayfragment shader, then I think we're good to go. |
Added define for opencv to be able to use either opencv or opengl. Removed dublicate of flextGL .c/.h
I don't have the kinect at hand at the moment to test it out. Could you check if it's okay? https://github.com/OpenKinect/libfreenect2/pull/361/files#diff-8ca25d621f26a3215be9537b77208b46R59 |
The last commit introduces hard dependency on C++11. As discussed before in #261, we want to avoid this. Can you add a wrapper like this? double getTime()
{
#if __cplusplus >= 201103L
//not tested:
static auto start = std::chrono::high_resolution_clock::now();
auto end = std::chrono::high_resolution_clock::now();
auto duration = end - start;
return std::chrono::duration_cast<std::chrono::duration<double>>(duration).count();
#elif LIBFREENECT2_WITH_OPENGL_SUPPORT
return glfwGetTime();
#else
return 0;
#endif
} I guess you need to find a place for this function. Ultimately it should be in |
aa71965
to
271f9c9
Compare
Made a new Timer class, when #309 is merged it can be moved to the logging source files. |
The rest looks fine to me. |
Now it's using the full resolution of chrono. |
Tests OK on Intel/Linux/OpenCL. |
Alright, last big one. I'm pretty certain it will still break in some contexts, but if we don't merge it now, this release will never happen :-) |
Removes opencv dependency, add OpenGL viewer & own timer class
Rebased and squashed #261