Skip to content
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

support more camera models #24

Merged
merged 5 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:

jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
defaults:
run:
shell: bash -l {0}
Expand All @@ -38,5 +38,5 @@ jobs:
- name: Build and install
run: |
mv /xrprimer ../
cmake -B build -D XRSLAM_TEST=ON
cmake -B build
cmake --build build -j4
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ concurrency:

jobs:
lint:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
Expand Down
235 changes: 0 additions & 235 deletions 3rdparty/SiftGPU/CLTexImage.cpp

This file was deleted.

85 changes: 0 additions & 85 deletions 3rdparty/SiftGPU/CLTexImage.h

This file was deleted.

1 change: 1 addition & 0 deletions 3rdparty/SiftGPU/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@ message(STATUS " CUDA Module : ${SIFT_GPU_LIBRARIES} | ${GLEW_LIBRARIES}")

target_link_libraries(sift_gpu
${GLEW_LIBRARIES}
${OPENGL_gl_LIBRARY}
)
2 changes: 2 additions & 0 deletions 3rdparty/SiftGPU/CuTexImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ struct textureReference;

#define SIFTGPU_ENABLE_LINEAR_TEX2D

typedef unsigned int GLuint;

class CuTexImage {
protected:
void *_cuData;
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/SiftGPU/GLTexImage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ int GLTexImage::CheckTexture() {
return _texWidth == 0 && _texHeight == 0;
}
}
// set a dimension that is smaller than the actually size
// set a dimension that is smaller than the actual size
// for drawQuad
void GLTexImage::SetImageSize(int width, int height) {
_drawWidth = _imgWidth = width;
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/SiftGPU/GLTexImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Description : interface for the GLTexImage class.
// GLTexImage: naive texture class.
// sevral different quad drawing
// functions are provide GLTexPacked: packed version (four
// functions are provided GLTexPacked: packed version (four
// value packed as four channels of a pixel) GLTexInput:
// GLTexImage + some input information
//
Expand Down
2 changes: 2 additions & 0 deletions 3rdparty/SiftGPU/GlobalUtil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,8 @@ void GlobalUtil::InitGLParam(int NotTargetGL) {

const char *vendor = (const char *)glGetString(GL_VENDOR);
if (vendor) {
if (GlobalUtil::_verbose)
std::cout << "[GPU VENDOR]:\t" << vendor << "\n";
GlobalUtil::_IsNvidia = (strstr(vendor, "NVIDIA") != NULL ? 1 : 0);

// Let nVidia compiler to take care of the unrolling.
Expand Down
Loading
Loading