Skip to content

Commit

Permalink
Name change update.
Browse files Browse the repository at this point in the history
  • Loading branch information
egemenertugrul committed Nov 17, 2023
1 parent 1e356d4 commit ec19ca0
Show file tree
Hide file tree
Showing 25 changed files with 56 additions and 54 deletions.
34 changes: 0 additions & 34 deletions .github/workflows/owxr-renderer.yml

This file was deleted.

34 changes: 34 additions & 0 deletions .github/workflows/wisor-renderer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Renderer

on:
workflow_dispatch:
push:
paths:
- "wisor/**"
- ".github/workflows/wisor-renderer.yml"
pull_request:
branches: [main]
paths:
- "wisor/**"
- ".github/workflows/wisor-renderer.yml"

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
submodules: true

- name: Setup Environment
run: |
sudo apt-get update -qq
sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev
- name: Build All
run: |
make all PLATFORM=PLATFORM_DESKTOP GRAPHICS=GRAPHICS_API_OPENGL_21
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
openwixr_renderer
wisor_renderer
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# List of sub-modules

.PHONY: all rebuild raylib owxr clean
.PHONY: all rebuild raylib wisor clean

MODULES = all raylib/src owxr
MODULES = all raylib/src wisor

all:
@for module in $(MODULES); do \
Expand All @@ -25,8 +25,8 @@ rebuild:
raylib:
$(MAKE) -C raylib/src $(MAKEFLAGS);

owxr:
$(MAKE) -C owxr $(MAKEFLAGS);
wisor:
$(MAKE) -C wisor $(MAKEFLAGS);

clean:
@if [ -z "$(module)" ]; then \
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
<center><h1 align=center>OpenWiXR-Renderer</h1></center>
<center><h1 align=center>Wisor-Renderer</h1></center>

**Wisor-Renderer** is the standalone rendering engine of Wisor, built using raylib, designed to provide basic rendering, UI, and input capabilities for your standalone XR applications. It works in conjunction with Wisor-Core.

![](./_docs/imgs/openwixr_renderer.png)
![](./_docs/imgs/wisor_renderer.png)

## Getting Started

This project uses multiple ``Makefile``s for managing the build process.
This project uses multiple `Makefile`s for managing the build process.
Before building the Wisor-Renderer project, ensure that your `make` flags meet the requirements of your Raspberry Pi. Read and follow [raylib's wiki](https://github.com/raysan5/raylib/wiki/Working-on-Raspberry-Pi), and install required packages in case there are compilation errors.

The version of the OpenGL is crucial to make everything run as expected. For the stereo rendering to work, OpenGL version should be either:
* OpenGL 2.1 on X11 desktop mode (`PLATFORM_DESKTOP`),
* OpenGL ES 2.0 in **native mode** (no X11 required) (``PLATFORM_DRM`` or ``PLATFORM_RPI``)

- OpenGL 2.1 on X11 desktop mode (`PLATFORM_DESKTOP`),
- OpenGL ES 2.0 in **native mode** (no X11 required) (`PLATFORM_DRM` or `PLATFORM_RPI`)

## Building the Project

Tested and recommended with X11:

```bash
make all PLATFORM=PLATFORM_DESKTOP GRAPHICS=GRAPHICS_API_OPENGL_21
```
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions owxr/Makefile → wisor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
#
#**************************************************************************************************

.PHONY: all owxr rebuild clean
.PHONY: all wisor rebuild clean

# Define required environment variables
#------------------------------------------------------------------------------------------------
# Define target platform: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB
PLATFORM ?= PLATFORM_DESKTOP

# Define required raylib variables
PROJECT_NAME ?= OpenWiXR-Renderer
PROJECT_NAME ?= Wisor-Renderer
RAYLIB_VERSION ?= 4.5.0
RAYLIB_PATH ?= ../raylib

Expand Down Expand Up @@ -402,21 +402,21 @@ INCLUDE_PATHS += -I./include
INCLUDE_PATHS += -I./include

BUILD_DIR = ..
EXECUTABLE_NAME = openwixr_renderer
EXECUTABLE_NAME = renderer

OWXR = \
wisor = \
external/parson.c \
external/raycast_helper.c \
pipe_rw.c \
hoverlib.c \
main.c \

all: owxr
all: wisor

owxr: $(OWXR)
wisor: $(wisor)
$(CC) -o $(BUILD_DIR)/$(EXECUTABLE_NAME)$(EXT) $^ $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)

@echo OpenWiXR Renderer is built. Makeflags: $(MAKEFLAGS)
@echo Wisor Renderer is built. Makeflags: $(MAKEFLAGS)

rebuild: clean all

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions owxr/main.c → wisor/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,9 @@ int main(int argc, char* argv[])
// Initialization
//--------------------------------------------------------------------------------------
if(isDesktop)
InitWindow(screenWidth, screenHeight, "OpenWiXR");
InitWindow(screenWidth, screenHeight, "Wisor");
else
InitWindow(screenHeight, screenWidth, "OpenWiXR");
InitWindow(screenHeight, screenWidth, "Wisor");

// VR device parameters definition
VrDeviceInfo device = {
Expand Down Expand Up @@ -327,7 +327,7 @@ int main(int argc, char* argv[])

// Distortion shader (uses device lens distortion and chroma)
//Shader distortion = LoadShader(0, TextFormat("resources/distortion%i.fs", GLSL_VERSION));
Shader distortion = LoadShader(0, "resources/distortion_openwixr_120.fs");
Shader distortion = LoadShader(0, "resources/distortion_wisor_120.fs");

const float _offset[] = { offsetX, offsetY };
const float _distortion[] = { 0.3f };
Expand Down
File renamed without changes.

0 comments on commit ec19ca0

Please sign in to comment.