.gitignore

@@ -1,4 +1,3 @@
 sinpin_vr
 .vscode/
 *.zip
-*.tar.xz

Makefile

@@ -1,23 +1,18 @@
-VERSION=v0.2.3
+VERSION=v0.2.2
-
+CC := g++
-CXX := g++
+# CC := clang++
-# CXX := clang++
-CPPFLAGS := -g -Wall -std=c++17
 LFLAGS := -lX11 -lXrandr -lXtst -lglfw -lGL
-OVR := -Llib -lopenvr_api
+LIBS := openvr/libopenvr_api.so
-TARGET := ./sinpin_vr
+SRC := src/*.cpp
+OUT := ./sinpin_vr
+CPPFLAGS := -Wall -std=c++17 $(LFLAGS) $(LIBS) $(SRC) -o $(OUT)
 
 build:
-	$(CXX) src/*.cpp $(CPPFLAGS) $(LFLAGS) -Wl,-rpath,'$$ORIGIN/lib' $(OVR) -o $(TARGET)
+	$(CC) -g $(CPPFLAGS)
 
 release: build
-	mkdir -p sinpin-vr/lib
+	zip -r sinpin_vr-$(VERSION).zip sinpin_vr bindings openvr/libopenvr_api.so
-	cp lib/libopenvr_api.so sinpin-vr/lib
-	cp -r bindings sinpin-vr
-	cp sinpin_vr sinpin-vr
-	tar -caf sinpin-vr-$(VERSION).tar.xz sinpin-vr
-	rm -rf sinpin-vr
 
 run: build
-	$(TARGET)
+	$(OUT)
 

bindings/action_manifest.json

@@ -56,11 +56,6 @@
 			"requirement": "suggested",
 			"type": "vector2"
 		},
-		{
-			"name": "/actions/cursor/in/toggle_transparent",
-			"requirement": "suggested",
-			"type": "boolean"
-		},
 		{
 			"name": "/actions/cursor/out/scroll_haptic",
 			"requirement": "suggested",
@@ -94,7 +89,6 @@
 			"/actions/cursor/in/mouse_right": "right mouse button",
 			"/actions/cursor/in/mouse_middle": "middle mouse button",
 			"/actions/cursor/in/scroll": "scroll",
-			"/actions/cursor/in/toggle_transparent": "toggle transparency",
 			"/actions/cursor/out/scroll_haptic": "scrolling haptic feedback"
 		}
 	]

src/app.cpp

@@ -10,7 +10,6 @@
 const VRMat root_start_pose = {{{1, 0, 0, 0}, {0, 1, 0, 0.8f}, {0, 0, 1, 0}}}; // 0.8m above origin
 
 const int FRAME_INTERVAL = 4; // number of update loops until the frame buffer is updated
-const float TRANSPARENCY = 0.6f;
 
 App::App()
 {
@@ -76,8 +75,6 @@ App::App()
 		assert(action_err == 0);
 		action_err = vr_input->GetActionHandle("/actions/cursor/in/scroll", &_input_handles.cursor.scroll);
 		assert(action_err == 0);
-		action_err = vr_input->GetActionHandle("/actions/cursor/in/toggle_transparent", &_input_handles.cursor.toggle_transparent);
-		assert(action_err == 0);
 		action_err = vr_input->GetActionHandle("/actions/cursor/out/scroll_haptic", &_input_handles.cursor.scroll_haptic);
 		assert(action_err == 0);
 		action_err = vr_input->GetActionSetHandle("/actions/main", &_input_handles.main_set);
@@ -196,20 +193,6 @@ void App::UpdateInput(float dtime)
 		}
 		UpdateUIVisibility();
 	}
-	if (IsInputJustPressed(_input_handles.cursor.toggle_transparent))
-	{
-		_transparent = !_transparent;
-		if (_transparent)
-		{
-			for (auto &panel : _panels)
-				panel.GetOverlay()->SetAlpha(TRANSPARENCY);
-		}
-		else
-		{
-			for (auto &panel : _panels)
-				panel.GetOverlay()->SetAlpha(1);
-		}
-	}
 	if (!_hidden)
 	{
 		if (IsInputJustPressed(_input_handles.main.reset))

src/app.h

@@ -33,7 +33,6 @@ struct InputHandles
 		vr::VRActionHandle_t mouse_middle;
 		vr::VRActionHandle_t scroll;
 		vr::VRActionHandle_t scroll_haptic;
-		vr::VRActionHandle_t toggle_transparent;
 	} cursor;
 	vr::VRActionSetHandle_t cursor_set;
 	struct
@@ -88,7 +87,6 @@ class App
 	Overlay _root_overlay;
 	std::vector<Panel> _panels;
 	bool _hidden = false;
-	bool _transparent = false;
 	bool _edit_mode = false;
 	std::optional<Controller *> _active_cursor;
 

src/util.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../lib/openvr.h"
+#include "../openvr/openvr.h"
 #include <glm/glm.hpp>
 
 typedef vr::TrackedDeviceIndex_t TrackerID;