paella
/
paella
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a template, and removed compilation of stuff with uggly broken 

since recently
This commit is contained in:
Thomas FORGIONE 2015-08-23 21:20:58 +02:00
parent 3ee36c9282
commit 918f632ccb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Animation/AnimatedMain.cpp
View File

@ -51,7 +51,8 @@
constexpr auto WIDTH = 1920;
constexpr auto HEIGHT = 1080;
void drawScene(std::unique_ptr<sft::Camera> const& camera, pae::AnimatedMesh const& mesh);
template<typename T>
void drawScene(T const& camera, pae::AnimatedMesh const& mesh);
int main(int argc, char *argv[])
{
@ -201,7 +202,8 @@ int main(int argc, char *argv[])
return 0;
}
void drawScene(std::unique_ptr<sft::Camera> const& camera, pae::AnimatedMesh const& mesh)
template<typename T>
void drawScene(T const& camera, pae::AnimatedMesh const& mesh)
{
// Initialisation
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

4
src/Skeleton/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_library(Skeleton2D Box.cpp Branch.cpp Skeleton.cpp)
add_executable(SkeletonDrawing draw.cpp)
target_link_libraries(SkeletonDrawing ${SFML_LIBRARIES} ${OPENGL_LIBRARIES} SFMLTools Skeleton2D)
# add_executable(SkeletonDrawing draw.cpp)
# target_link_libraries(SkeletonDrawing ${SFML_LIBRARIES} ${OPENGL_LIBRARIES} SFMLTools Skeleton2D)
add_executable(Skeleton main.cpp)
target_link_libraries(Skeleton SFMLTools Skeleton2D DetectionAndMatching ${OPENGL_LIBRARIES} ${OpenCV_LIBRARIES} ${Boost_LIBRARIES})