~sircmpwn/xrgears

f214640a4cc4016b2cfeb22060937b4cb297f217 — Lubosz Sarnecki 4 years ago d225105
move vkc and vks to vik in files.
38 files changed, 72 insertions(+), 71 deletions(-)

M examples/triangle/triangle.cpp
M examples/vkcube/main.cpp
M examples/xrgears/xrgears.cpp
R vkc/vkcApplication.hpp => vitamin-k/vikApplicationVkc.hpp
R vks/vksApplication.hpp => vitamin-k/vikApplicationVks.hpp
R vks/vksBuffer.hpp => vitamin-k/vikBuffer.hpp
M vitamin-k/vikCamera.hpp
R vks/vksCamera.hpp => vitamin-k/vikCameraBase.hpp
M vitamin-k/vikCameraHMD.hpp
M vitamin-k/vikCameraStereo.hpp
R vks/vksDebug.hpp => vitamin-k/vikDebug.hpp
R vks/vksDevice.hpp => vitamin-k/vikDevice.hpp
M vitamin-k/vikDistortion.hpp
M vitamin-k/vikGear.hpp
M vitamin-k/vikHMD.hpp
R vks/vksInitializers.hpp => vitamin-k/vikInitializers.hpp
R vks/vksLog.hpp => vitamin-k/vikLog.hpp
R vks/vksModel.hpp => vitamin-k/vikModel.hpp
M vitamin-k/vikNode.hpp
M vitamin-k/vikNodeGear.hpp
M vitamin-k/vikOffscreenPass.hpp
R vkc/vkcRenderer.hpp => vitamin-k/vikRendererVkc.hpp
R vks/vksRenderer.hpp => vitamin-k/vikRendererVks.hpp
M vitamin-k/vikSettings.hpp
M vitamin-k/vikShader.hpp
M vitamin-k/vikSkyBox.hpp
M vitamin-k/vikSwapChain.hpp
R vks/vksSwapChain.hpp => vitamin-k/vikSwapChainVKComplex.hpp
R vks/vksTextOverlay.hpp => vitamin-k/vikTextOverlay.hpp
R vks/vksTexture.hpp => vitamin-k/vikTexture.hpp
R vks/vksTimer.hpp => vitamin-k/vikTimer.hpp
R vks/vksTools.hpp => vitamin-k/vikTools.hpp
M vitamin-k/vikWindowKMS.hpp
M vitamin-k/vikWindowKhrDisplay.hpp
M vitamin-k/vikWindowWaylandShell.hpp
M vitamin-k/vikWindowWaylandXDG.hpp
M vitamin-k/vikWindowXCBInput.hpp
M vitamin-k/vikWindowXCBSimple.hpp
M examples/triangle/triangle.cpp => examples/triangle/triangle.cpp +1 -1
@@ 26,7 26,7 @@

#include <vulkan/vulkan.h>

#include "vksApplication.hpp"
#include "vikApplicationVks.hpp"
#include "vikShader.hpp"

// Set to "true" to use staging buffers for uploading vertex and index data to device local memory

M examples/vkcube/main.cpp => examples/vkcube/main.cpp +3 -3
@@ 35,18 35,18 @@
 * to configure when configuring vkcube
 */

#include "../vkc/vkcApplication.hpp"
#include "vikApplicationVkc.hpp"

#include <sys/time.h>
#include <string.h>

#include "../vks/vksLog.hpp"
#include "vikLog.hpp"

#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtx/euler_angles.hpp>

#include "../vkc/vkcRenderer.hpp"
#include "vikRendererVkc.hpp"
#include "vikShader.hpp"

#define VK_PROTOTYPES

M examples/xrgears/xrgears.cpp => examples/xrgears/xrgears.cpp +3 -3
@@ 24,8 24,8 @@

#include <vulkan/vulkan.h>

#include "vksApplication.hpp"
#include "vksModel.hpp"
#include "vikApplicationVks.hpp"
#include "vikModel.hpp"

#include "vikNodeGear.hpp"
#include "vikSkyBox.hpp"


@@ 36,7 36,7 @@
#include "vikHMD.hpp"
#include "vikCameraStereo.hpp"
#include "vikCameraHMD.hpp"
#include "vksLog.hpp"
#include "vikLog.hpp"

#define VERTEX_BUFFER_BIND_ID 0


R vkc/vkcApplication.hpp => vitamin-k/vikApplicationVkc.hpp +5 -5
@@ 6,12 6,12 @@

#include <functional>

#include "../vitamin-k/vikApplication.hpp"
#include "vikApplication.hpp"

#include "../vitamin-k/vikWindowXCBSimple.hpp"
#include "../vitamin-k/vikWindowKMS.hpp"
#include "../vitamin-k/vikWindowWaylandXDG.hpp"
#include "vkcRenderer.hpp"
#include "vikWindowXCBSimple.hpp"
#include "vikWindowKMS.hpp"
#include "vikWindowWaylandXDG.hpp"
#include "vikRendererVkc.hpp"

namespace vkc {


R vks/vksApplication.hpp => vitamin-k/vikApplicationVks.hpp +5 -5
@@ 23,12 23,12 @@
#include <array>
#include <vector>

#include "vksTools.hpp"
#include "vksInitializers.hpp"
#include "vikTools.hpp"
#include "vikInitializers.hpp"

#include "vksCamera.hpp"
#include "vksRenderer.hpp"
#include "vksTimer.hpp"
#include "vikCameraBase.hpp"
#include "vikRendererVks.hpp"
#include "vikTimer.hpp"

#include "vikWindowWaylandShell.hpp"
#include "vikWindowXCBInput.hpp"

R vks/vksBuffer.hpp => vitamin-k/vikBuffer.hpp +2 -2
@@ 14,8 14,8 @@

#include "vulkan/vulkan.h"

#include "vksTools.hpp"
#include "vksDevice.hpp"
#include "vikTools.hpp"
#include "vikDevice.hpp"

namespace vks {
/**

M vitamin-k/vikCamera.hpp => vitamin-k/vikCamera.hpp +1 -1
@@ 19,7 19,7 @@
#include <glm/gtc/matrix_transform.hpp>
#include <gli/gli.hpp>

#include "../vks/vksCamera.hpp"
#include "vikCameraBase.hpp"

namespace vik {
class Camera {

R vks/vksCamera.hpp => vitamin-k/vikCameraBase.hpp +0 -0
M vitamin-k/vikCameraHMD.hpp => vitamin-k/vikCameraHMD.hpp +1 -1
@@ 11,7 11,7 @@

#pragma once

#include "../vks/vksCamera.hpp"
#include "vikCameraBase.hpp"

#include "vikCamera.hpp"
#include "vikHMD.hpp"

M vitamin-k/vikCameraStereo.hpp => vitamin-k/vikCameraStereo.hpp +2 -2
@@ 11,8 11,8 @@

#pragma once

#include "../vks/vksBuffer.hpp"
#include "../vks/vksCamera.hpp"
#include "vikBuffer.hpp"
#include "vikCameraBase.hpp"

#include "vikCamera.hpp"


R vks/vksDebug.hpp => vitamin-k/vikDebug.hpp +0 -0
R vks/vksDevice.hpp => vitamin-k/vikDevice.hpp +2 -2
@@ 18,8 18,8 @@
#include <vector>
#include <string>

#include "vksTools.hpp"
#include "vksBuffer.hpp"
#include "vikTools.hpp"
#include "vikBuffer.hpp"

namespace vks {
class Device {

M vitamin-k/vikDistortion.hpp => vitamin-k/vikDistortion.hpp +2 -2
@@ 16,8 16,8 @@

#include <vector>

#include "../vks/vksModel.hpp"
#include "../vks/vksLog.hpp"
#include "vikModel.hpp"
#include "vikLog.hpp"

#include "vikOffscreenPass.hpp"
#include "vikShader.hpp"

M vitamin-k/vikGear.hpp => vitamin-k/vikGear.hpp +2 -2
@@ 13,8 13,8 @@

#include <vector>

#include "../vks/vksBuffer.hpp"
#include "../vks/vksDevice.hpp"
#include "vikBuffer.hpp"
#include "vikDevice.hpp"

namespace vik {
struct Vertex {

M vitamin-k/vikHMD.hpp => vitamin-k/vikHMD.hpp +3 -3
@@ 20,9 20,9 @@

#include <openhmd/openhmd.h>

#include "../vks/vksCamera.hpp"
#include "../vks/vksBuffer.hpp"
#include "../vks/vksLog.hpp"
#include "vikCameraBase.hpp"
#include "vikBuffer.hpp"
#include "vikLog.hpp"


#include "vikCamera.hpp"

R vks/vksInitializers.hpp => vitamin-k/vikInitializers.hpp +0 -0
R vks/vksLog.hpp => vitamin-k/vikLog.hpp +0 -0
R vks/vksModel.hpp => vitamin-k/vikModel.hpp +2 -2
@@ 26,8 26,8 @@
#include <vector>
#include <utility>

#include "vksDevice.hpp"
#include "vksBuffer.hpp"
#include "vikDevice.hpp"
#include "vikBuffer.hpp"

namespace vks {
/** @brief Vertex layout components */

M vitamin-k/vikNode.hpp => vitamin-k/vikNode.hpp +1 -1
@@ 13,7 13,7 @@

#include <vector>

#include "../vks/vksModel.hpp"
#include "vikModel.hpp"

#include "vikMaterial.hpp"
#include "vikAssets.hpp"

M vitamin-k/vikNodeGear.hpp => vitamin-k/vikNodeGear.hpp +3 -3
@@ 22,9 22,9 @@

#include <vector>

#include "../vks/vksTools.hpp"
#include "../vks/vksBuffer.hpp"
#include "../vks/vksCamera.hpp"
#include "vikTools.hpp"
#include "vikBuffer.hpp"
#include "vikCameraBase.hpp"

#include "vikMaterial.hpp"
#include "vikGear.hpp"

M vitamin-k/vikOffscreenPass.hpp => vitamin-k/vikOffscreenPass.hpp +1 -1
@@ 15,7 15,7 @@

#include <vector>

#include "../vks/vksDevice.hpp"
#include "vikDevice.hpp"

// Offscreen frame buffer properties
#define FB_DIM 2048

R vkc/vkcRenderer.hpp => vitamin-k/vikRendererVkc.hpp +0 -0
R vks/vksRenderer.hpp => vitamin-k/vikRendererVks.hpp +4 -4
@@ 8,10 8,10 @@

#include "vikRenderer.hpp"

#include "vksDevice.hpp"
#include "vksSwapChain.hpp"
#include "vksTimer.hpp"
#include "vksTextOverlay.hpp"
#include "vikDevice.hpp"
#include "vikSwapChainVKComplex.hpp"
#include "vikTimer.hpp"
#include "vikTextOverlay.hpp"
#include "vikSettings.hpp"
#include "vikShader.hpp"


M vitamin-k/vikSettings.hpp => vitamin-k/vikSettings.hpp +1 -1
@@ 5,7 5,7 @@

#include <string>

#include "../vks/vksLog.hpp"
#include "vikLog.hpp"

#include "vikWindow.hpp"


M vitamin-k/vikShader.hpp => vitamin-k/vikShader.hpp +1 -1
@@ 15,7 15,7 @@

#include <string>

#include "../vks/vksTools.hpp"
#include "vikTools.hpp"

#include "vikAssets.hpp"


M vitamin-k/vikSkyBox.hpp => vitamin-k/vikSkyBox.hpp +2 -2
@@ 13,8 13,8 @@

#include <vector>

#include "../vks/vksTexture.hpp"
#include "../vks/vksModel.hpp"
#include "vikTexture.hpp"
#include "vikModel.hpp"

#include "vikAssets.hpp"
#include "vikShader.hpp"

M vitamin-k/vikSwapChain.hpp => vitamin-k/vikSwapChain.hpp +1 -1
@@ 5,7 5,7 @@
#include <vector>
#include <functional>

#include "../vks/vksLog.hpp"
#include "vikLog.hpp"

namespace vik {


R vks/vksSwapChain.hpp => vitamin-k/vikSwapChainVKComplex.hpp +2 -2
@@ 21,9 21,9 @@
#include <fstream>
#include <vector>

#include "vksTools.hpp"
#include "vikTools.hpp"

#include "vksLog.hpp"
#include "vikLog.hpp"
#include "vikSwapChainVK.hpp"

namespace vks {

R vks/vksTextOverlay.hpp => vitamin-k/vikTextOverlay.hpp +4 -4
@@ 20,10 20,10 @@
#include <iomanip>
#include <string>

#include "vksTools.hpp"
#include "vksDebug.hpp"
#include "vksBuffer.hpp"
#include "vksDevice.hpp"
#include "vikTools.hpp"
#include "vikDebug.hpp"
#include "vikBuffer.hpp"
#include "vikDevice.hpp"

#include "../data/stb_font_consolas_24_latin1.inl"


R vks/vksTexture.hpp => vitamin-k/vikTexture.hpp +4 -4
@@ 17,10 17,10 @@
#include <fstream>
#include <vector>

#include "vksTools.hpp"
#include "vksDevice.hpp"
#include "vksBuffer.hpp"
#include "vksLog.hpp"
#include "vikTools.hpp"
#include "vikDevice.hpp"
#include "vikBuffer.hpp"
#include "vikLog.hpp"

namespace vks {
/** @brief Vulkan texture base class */

R vks/vksTimer.hpp => vitamin-k/vikTimer.hpp +0 -0
R vks/vksTools.hpp => vitamin-k/vikTools.hpp +2 -2
@@ 22,8 22,8 @@
#include <iostream>
#include <stdexcept>

#include "vksInitializers.hpp"
#include "vksLog.hpp"
#include "vikInitializers.hpp"
#include "vikLog.hpp"

// Custom define for better code readability
#define VK_FLAGS_NONE 0

M vitamin-k/vikWindowKMS.hpp => vitamin-k/vikWindowKMS.hpp +3 -3
@@ 21,10 21,10 @@
#include <linux/vt.h>
#include <linux/major.h>

#include "../vkc/vkcRenderer.hpp"
#include "vikRenderer.hpp"
#include "vikWindow.hpp"
#include "../vks/vksLog.hpp"

#include "vikLog.hpp"
#include "vikSwapChainDRM.hpp"
static void
page_flip_handler(int fd, unsigned int frame,
                  unsigned int sec, unsigned int usec, void *data)

M vitamin-k/vikWindowKhrDisplay.hpp => vitamin-k/vikWindowKhrDisplay.hpp +1 -1
@@ 14,7 14,7 @@
#include <vulkan/vulkan.h>

#include "vikWindow.hpp"
#include "../vks/vksSwapChain.hpp"
#include "vikSwapChainVKComplex.hpp"

namespace vik {
class WindowKhrDisplay  : public Window {

M vitamin-k/vikWindowWaylandShell.hpp => vitamin-k/vikWindowWaylandShell.hpp +1 -1
@@ 14,7 14,7 @@
#include <vulkan/vulkan.h>

#include "vikWindowWayland.hpp"
#include "../vks/vksSwapChain.hpp"
#include "vikSwapChainVKComplex.hpp"

namespace vik {
class WindowWaylandShell : public WindowWayland {

M vitamin-k/vikWindowWaylandXDG.hpp => vitamin-k/vikWindowWaylandXDG.hpp +2 -2
@@ 6,9 6,9 @@
#include <poll.h>

#include <vulkan/vulkan.h>
#include "../vkc/vkcRenderer.hpp"
#include "vikRendererVkc.hpp"
#include "../xdg-shell/xdg-shell-unstable-v6-client-protocol.h"
#include "../vks/vksLog.hpp"
#include "vikLog.hpp"
#include "vikWindowWayland.hpp"

namespace vik {

M vitamin-k/vikWindowXCBInput.hpp => vitamin-k/vikWindowXCBInput.hpp +2 -2
@@ 14,8 14,8 @@
#include <vulkan/vulkan.h>
#include <string>

#include "../vks/vksLog.hpp"
#include "../vks/vksSwapChain.hpp"
#include "vikLog.hpp"
#include "vikSwapChainVKComplex.hpp"
#include "vikWindowXCB.hpp"

namespace vik {

M vitamin-k/vikWindowXCBSimple.hpp => vitamin-k/vikWindowXCBSimple.hpp +3 -2
@@ 3,9 3,10 @@
#include <string.h>
#include <stdio.h>

#include "../vkc/vkcRenderer.hpp"
#include "vikRendererVkc.hpp"
#include "vikWindowXCB.hpp"
#include "../vks/vksLog.hpp"
#include "vikLog.hpp"
#include "vikSwapChainVK.hpp"

static xcb_atom_t
get_atom(struct xcb_connection_t *conn, const char *name)