Skip to content

Commit

Permalink
[pull] master from alvr-org:master (#139)
Browse files Browse the repository at this point in the history
* Increase maximum resolution from 4096 to 8192

* decimal instead of hex

* chore: add formatting style for c++

* chore: reformat c++ to new style

* chore: add c++ autoformatter

* chore: Add missed/bugfixed format changes

* fix: routing assumption basis of microphone loopback detection (alvr-org#2209)

* fix(server) HEVC black screen on some linux config (alvr-org#2203)

* refactor(xtask): ♻️ Fix clippy and refactor (alvr-org#2213)

* fix(client_core): 🐛 Fix USB mode (alvr-org#2214)

* refactor(client): ♻️ Remove separate Pico Neo 3 Link platform

* client gfx refactor (7): partially port lobby

* feat(client): ✨ Show hands in lobby

* feat(client_openxr): ✨ Make lobby use max swapchain res (alvr-org#2220)

* feat(client_core): ✨ Thicken lobby grid lines

* fix(client): 🐛 Fix performance regressions on Quest 1

---------

Co-authored-by: shinyquagsire23 <mtinc2@gmail.com>
Co-authored-by: Leonhard Saam <leonhard.saam@yahoo.com>
Co-authored-by: 瑄 <shanboxuan@gmail.com>
Co-authored-by: Nibor62 <Nibor62@users.noreply.github.com>
Co-authored-by: zarik5 <riccardo.zaglia5@gmail.com>
  • Loading branch information
6 people authored Jul 5, 2024
1 parent 6fa034c commit 12c7ce4
Show file tree
Hide file tree
Showing 110 changed files with 10,596 additions and 44,504 deletions.
6 changes: 5 additions & 1 deletion .clang-format
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
BasedOnStyle: WebKit
IndentWidth: 4
ColumnLimit: 100
BinPackArguments: false
BinPackParameters: false
BinPackParameters: false
AlignAfterOpenBracket: BlockIndent
BreakBeforeBraces: Attach
InsertNewlineAtEOF: true
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Editor configuration, see https://editorconfig.org

[*.{c,cpp,h,hpp}]
indent_style = space
indent_size = 4
tab_width = 4
max_line_length = 100
end_of_line = lf
insert_final_newline = true

[.editorconfig]
indent_style = space
indent_size = 4
tab_width = 4
end_of_line = lf
insert_final_newline = true
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ alvr/client_core/cpp/VrApi_* linguist-vendored
alvr/client_core/cpp/glm/** linguist-vendored
alvr/client_core/cpp/tinygltf/** linguist-vendored
alvr/server/cpp/alvr_server/include/** linguist-vendored
alvr/server/cpp/openvr/** linguist-vendored
alvr/server/cpp/alvr_server/nvEncodeAPI.h linguist-vendored
alvr/server/cpp/platform/win32/NvCodecUtils.h linguist-vendored
alvr/server/cpp/platform/win32/NvEncoder.cpp linguist-vendored
alvr/server/cpp/platform/win32/NvEncoder.h linguist-vendored
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ jobs:
command: test
args: -p alvr_session

rustfmt:
runs-on: ubuntu-latest
check-format:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
Expand All @@ -154,10 +154,7 @@ jobs:
override: true
components: rustfmt

- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
- run: cargo xtask check-format

check-msrv-windows:
runs-on: windows-2019
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 0 additions & 14 deletions alvr/client_core/cpp/bindings.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,9 @@ struct FfiStreamConfig {
float encodingGamma;
};

// gltf_model.h
extern "C" const unsigned char *LOBBY_ROOM_GLTF_PTR;
extern "C" unsigned int LOBBY_ROOM_GLTF_LEN;
extern "C" const unsigned char *LOBBY_ROOM_BIN_PTR;
extern "C" unsigned int LOBBY_ROOM_BIN_LEN;

// graphics.h
extern "C" void initGraphicsNative();
extern "C" void prepareLobbyRoom(int viewWidth,
int viewHeight,
const unsigned int *swapchainTextures[2],
int swapchainLength,
bool enable_srgb_correction);
extern "C" void destroyLobby();
extern "C" void destroyStream();
extern "C" void streamStartNative(FfiStreamConfig config);
extern "C" void updateLobbyHudTexture(const unsigned char *data);
extern "C" void renderLobbyNative(const FfiViewInput eyeInputs[2]);
extern "C" void renderStreamNative(void *streamHardwareBuffer,
const unsigned int swapchainIndices[2]);
238 changes: 0 additions & 238 deletions alvr/client_core/cpp/gltf_model.cpp

This file was deleted.

32 changes: 0 additions & 32 deletions alvr/client_core/cpp/gltf_model.h

This file was deleted.

Loading

0 comments on commit 12c7ce4

Please sign in to comment.