Uni/CGI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://bitbucket.org/cgvtud/cg1

Browse source
This commit is contained in:
hodasemi 2018-10-19 16:30:34 +02:00
commit 26144217b4
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMake/Modules/CG1Helper.cmake
View file

@ -75,9 +75,9 @@ FUNCTION(SetupBuildEnvironment)
endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -Wno-unused-result")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -Wno-unused-result -Wno-misleading-indentation")
endif()
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} PARENT_SCOPE)
set (CMAKE_CXX_STANDARD 14 PARENT_SCOPE)
ENDFUNCTION()
ENDFUNCTION()

5
CMakeLists.txt
View file

@ -30,7 +30,7 @@ set(OPENMESH_BUILD_PYTHON_BINDINGS OFF CACHE BOOL " " FORCE)
set(OPENMESH_BUILD_SHARED OFF CACHE BOOL " ")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/OpenMesh ext_build/OpenMesh)
if(TARGET OpenMeshCoreStatic)
set(LIBS ${LIBS} OpenMeshCoreStatic)
set(LIBS ${LIBS} OpenMeshCoreStatic)
set_property(TARGET OpenMeshCoreStatic OpenMeshToolsStatic PROPERTY FOLDER "dependencies")
set_property(TARGET OpenMeshCore OpenMeshToolsStatic PROPERTY EXCLUDE_FROM_ALL TRUE)
else()
@ -39,6 +39,7 @@ endif()
include_directories(ext/OpenMesh/src)
set_property(TARGET OpenMeshCore OpenMeshTools PROPERTY FOLDER "dependencies")
set_property(TARGET OpenMeshTools PROPERTY EXCLUDE_FROM_ALL TRUE)
add_definitions(/DOM_STATIC_BUILD)
add_subdirectory(common)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common/include)
@ -46,4 +47,4 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common/include)
add_subdirectory(exercise1)
add_subdirectory(exercise2)
add_subdirectory(exercise3)
add_subdirectory(exercise4)
add_subdirectory(exercise4)

1
exercise1/src/Viewer.cpp
View file

@ -112,6 +112,7 @@ void Viewer::CreateVertexBuffers()
// "in_position". First, get the location of this attribute in
// the shader program
GLuint vid = glGetAttribLocation(program_id, "in_position");
// Enable this vertex attribute array
glEnableVertexAttribArray(vid);
// Set the format of the data to match the type of "in_position"

2
exercise3/include/AABBTree.h
View file

@ -364,7 +364,7 @@ public:
if(k_best.size() < k )
{
k_best.push(ResultEntry(dist,*pit));
return;
continue;
}
if(k_best.top().SqrDistance > dist)
{