From df334c3941ff4ff2017feadee540153e4436af7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Con=C3=A1l?= <hopless@tyromancy.art>
Date: Wed, 7 Feb 2024 10:39:07 -0500
Subject: [PATCH] Got mouse and keyboard movement working -- I think

---
 Input/Input.cpp             |   9 +++------
 Renderer/Renderer.cpp       |   4 ++--
 Renderer/Renderer.hpp       |   2 +-
 Renderer/UniformBuffer.cpp  |   4 ----
 Renderer/UniformBuffer.hpp  |   8 ++++----
 Scene/Camera.hpp            |   6 +++++-
 UI/UI.cpp                   |  11 ++++++++++-
 assets/shaders/ray.frag     |  35 +++++++++++++++++++++++++++++++----
 assets/shaders/ray.frag.spv | Bin 1020 -> 2724 bytes
 assets/shaders/ray.vert     |  13 +++++++++----
 assets/shaders/ray.vert.spv | Bin 1304 -> 2132 bytes
 11 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/Input/Input.cpp b/Input/Input.cpp
index 1a0ab09..efd510a 100644
--- a/Input/Input.cpp
+++ b/Input/Input.cpp
@@ -82,18 +82,15 @@ void Input::handleMovementKeys(Renderer& ren) {
 		forward = glm::vec3(glm::sin(ren.cam.theta)*glm::cos(ren.cam.phi), glm::cos(ren.cam.theta), glm::sin(ren.cam.theta)*glm::sin(ren.cam.phi));
 	else
 		forward = glm::vec3(glm::cos(ren.cam.phi), 0.0, glm::sin(ren.cam.phi));
-	const auto right = glm::cross(forward, glm::vec3(0.0, 1.0, 0.0));
+	const auto right = glm::cross(glm::vec3(0.0, 1.0, 0.0), forward);
 	const auto speed = glfwGetKey(in, GLFW_KEY_LEFT_SHIFT)? 2.0f : 1.0f;
 
-	if(glfwGetKey(in, GLFW_KEY_UP)) {
-		ren.cam.theta -= 0.01;
-	}
 
 	if(glfwGetKey(in, GLFW_KEY_UP)) {
-		ren.cam.theta -= 0.01;
+		ren.cam.theta -= 0.02;
 	}
 	if(glfwGetKey(in, GLFW_KEY_DOWN)) {
-		ren.cam.theta += 0.01;
+		ren.cam.theta += 0.02;
 	}
 	
 	if(glfwGetKey(in, GLFW_KEY_LEFT)) {
diff --git a/Renderer/Renderer.cpp b/Renderer/Renderer.cpp
index f441cc4..5f961da 100644
--- a/Renderer/Renderer.cpp
+++ b/Renderer/Renderer.cpp
@@ -324,10 +324,10 @@ void Renderer::draw() {
 	auto sz = win.getDimensions();
 
 	uniform_buffer->upload(UniformData{
+		.view = cam.view(),
 		.viewport = glm::vec2(viewport.width, viewport.y),
 		.time = time,
-		.cam_pos = cam.pos,
-		.cam_dir = cam.dir(),
+		.focal_length = 2.0,
 	});
 
 	command_buffer->bind(*pipeline);
diff --git a/Renderer/Renderer.hpp b/Renderer/Renderer.hpp
index e904240..e53ae31 100644
--- a/Renderer/Renderer.hpp
+++ b/Renderer/Renderer.hpp
@@ -58,7 +58,7 @@ struct Renderer {
 
 	std::unique_ptr<UI> ui;
 
-	Camera cam{ .pos = glm::vec3(0.0, -10.0, 0.0), };
+	Camera cam{ .pos = glm::vec3(0.0, 0.0, -1.0), };
 
 	bool capture_mouse = false;
 	bool flycam = false;
diff --git a/Renderer/UniformBuffer.cpp b/Renderer/UniformBuffer.cpp
index 87eb174..c344d5b 100644
--- a/Renderer/UniformBuffer.cpp
+++ b/Renderer/UniformBuffer.cpp
@@ -8,10 +8,6 @@ UniformBuffer::UniformBuffer(vk::PhysicalDevice phys_dev, vk::Device dev) {
 			vk::MemoryPropertyFlagBits::eHostCoherent | vk::MemoryPropertyFlagBits::eHostVisible
 	);
 
-	Log::debug("Offset of time: %zu\n", offsetof(UniformData, time));
-	Log::debug("Offset of cam_pos: %zu\n", offsetof(UniformData, cam_pos));
-	Log::debug("Offset of viewport: %zu\n", offsetof(UniformData, viewport));
-
 }
 
 void UniformBuffer::upload(const UniformData& data) {
diff --git a/Renderer/UniformBuffer.hpp b/Renderer/UniformBuffer.hpp
index 4e47551..6cc0297 100644
--- a/Renderer/UniformBuffer.hpp
+++ b/Renderer/UniformBuffer.hpp
@@ -12,19 +12,19 @@
 /* Uniform:
  * 
  * layout (set = 0, binding = 0) uniform Matrices {
+ * 		mat4 view;
  *		vec2 viewport;
  *		float time;
- *		vec3 cam_pos;
- *		vec3 cam_dir;
+ *		float focal_length;
  *	};
  * 
  */
 
 struct UniformData {
+	glm::mat4 view;
 	glm::vec2 viewport;
 	float time;
-	glm::vec3 cam_pos;
-	glm::vec3 cam_dir;
+	float focal_length = 2.0;
 };
 
 struct UniformBuffer {
diff --git a/Scene/Camera.hpp b/Scene/Camera.hpp
index 15b2f54..bd799b7 100644
--- a/Scene/Camera.hpp
+++ b/Scene/Camera.hpp
@@ -15,7 +15,11 @@ struct Camera {
 	glm::vec3 pos = glm::vec3(0.0f);
 
 	inline glm::vec3 dir() {
-		return glm::vec3(sin(theta) * cos(phi), cos(theta), sin(theta) * sin(phi));
+		return glm::normalize(glm::vec3(
+			sin(theta) * cos(phi),
+			cos(theta),
+			sin(theta) * sin(phi)
+		));
 	}
 
 	inline glm::mat4 view() {
diff --git a/UI/UI.cpp b/UI/UI.cpp
index 5403320..6239537 100644
--- a/UI/UI.cpp
+++ b/UI/UI.cpp
@@ -89,9 +89,18 @@ void UI::newFrame() {
 	ImGui::SetNextWindowBgAlpha(0.5f);
 	ImGui::Begin("Rendering Info", nullptr);
 
+	auto target = info.cam.dir() + info.cam.pos;
+
 	ImGui::Text("FPS: %f", info.fps);
 	ImGui::Text("Time: %f", info.time);
-	ImGui::Checkbox("Fly Camera", &info.flycam);
+	ImGui::Text("Target: %f %f %f", target.x, target.y, target.z);
+	ImGui::SliderFloat("Theta", &info.cam.theta, 0.0, glm::pi<float>());
+	ImGui::SliderFloat("Phi", &info.cam.phi, 0.0, glm::two_pi<float>());
+	
+	ImGui::SliderFloat("X", &info.cam.pos.x, -10.0, 10.0);
+	ImGui::SliderFloat("Y", &info.cam.pos.y, -10.0, 10.0);
+	ImGui::SliderFloat("Z", &info.cam.pos.z, -10.0, 10.0);
+
 
 	ImGui::End();
 }
diff --git a/assets/shaders/ray.frag b/assets/shaders/ray.frag
index 432dfb4..546ca09 100644
--- a/assets/shaders/ray.frag
+++ b/assets/shaders/ray.frag
@@ -1,16 +1,43 @@
 #version 450 core
 
 layout (set = 0, binding = 0) uniform Matrices {
+	mat4 view;
 	vec2 viewport;
 	float time;
-	vec3 cam_pos;
-	vec3 cam_dir;
 };
 
-layout (location = 0) in vec2 texCoord;
+layout (location = 0) in vec3 pos;
+layout (location = 1) in vec3 dir;
 
 layout (location = 0) out vec4 fragColor;
 
+
+float sphere(vec3 p, vec3 center, float r) {
+	return length(p) - r;
+}
+
+float sdf(vec3 pos) {
+	return sphere(pos, vec3(0.0, 0.0, 10.0), 3.0);
+}
+
+float raycast() {
+	float t = 0.0;
+	for(int i = 0; i < 64; i++) {
+		float dt = sdf(pos + dir * t);
+		if(dt < 0.0001*t)
+			return t;
+		else if(dt > 200.0)
+			return -1;
+		t += dt;
+	}
+
+	return -1;
+}
+
 void main() {
-	fragColor = vec4(abs(texCoord), abs(cos(time)), 1.0);	
+	float d = raycast();
+
+	vec3 col = vec3(1.0-d*0.075);
+
+	fragColor = vec4(col, 1.0);
 }
\ No newline at end of file
diff --git a/assets/shaders/ray.frag.spv b/assets/shaders/ray.frag.spv
index e22c90e112dbcd4447efa473b500f52eab4ace53..e1f38d415efc7d3342adcbcdfdcc5ec0824ac47d 100644
GIT binary patch
literal 2724
zcmZQ(Qf6mhU}WHC;AJRafB-=TCI&_Z1_o{hHZbk(6YQf`T#}+^Vrl?V!N<T1qQG+e
z3>*wB3=CkLo0ypglCWT4V6b9fU`S<PU=Uzn2FtNCFfcGPFf%YQFfbfq1gYm@aQBIK
z_xE@Aag9$dD2OjEsmw`@&&kY7jZeueN=+`wEK3Ec<3LiEnU|bXnu4r=m4O9pKFn@b
z26hHM1_p-Wf{fInRE@GUV`~sjGqh%4U}a!t;AUU|`xB&(hk=11IW?~&wFn}|%fP@;
z!~kNmG6;dpNJ#@50P+(^uOLWoelY_p11p0lNNr+ea$<3b21K5PK@lXMSd^FxHiLyh
z8I7-k!e?dxX)FP&WoFQ3U|`6EvdtJ67*a|=?qFsBg=GQQPG)eJreqc|fZT46W>yqP
z4^)2)$Y1$6V0VJzAgw4d-8nxeALciZ`+O5iiZYW^i$QK@V_;<fiGkQ<nW^O<nvH=C
zECxykAhCk{B9K!VU}{0}Sdy6wG9DbR`5;XU3=HlJEMPawA@M<J0mKKH1(FA80`Wmg
zJQ!HO_JG)|3=9k&NNxdzA4nWo43v%pkko<91gUdC5(BvnB<2Bj4>Q<&kQm5rkUNz?
zhJxi-7(jebyn%#-8JNK7QxTj}8Nh5Y24)5}1_lNN1_lOk1{Ma8{UAOl2PiPGFmNz1
zfW<)KAU-FQ4^pGZz{bGEzyQ_{QU}5yc|`^m29O^>YCvKj`$VAXv>8~y>SaL=Vqjo^
z@gd=*;HbmE2DVS0fq?;}282O!Fm)hzGB7weh%&G+XhPi$3L}u)w4iPSiG$RGXdNVb
zKzw5c1_n@AiZC!Sn1J=OFqkudN(hKQtr;MEP`U(}3*&?07{mve3-Xr}D7>~`w1Dw_
z!1j1J!}tMUe#3qcA7pPB)D93Iq(2rSZx7?gGcYjBnmN-J6bH%BumY7kAb+KR%N7O(
zkT}RaAU-IKf#OJlfrTL(lpmmF6i9y#R6i(9$U)N^NDWLJWG1K}1IdH(1;|VgACy)=
zVrC4i;Isj<ALLAsJwF(j7(nS4q!tv%p!^6*6Cge)jzM`6#J7aTZ!`k~xD2slU}gZR
z1@Ud6a&Zg{V6j#PR&ZKKU|?VXiGjkP87h{@z`y_sBamDGG)*KiFff3`VHjjK$X<{*
z$ZU}PX$%YuAhAHGIq3`x3?MO(KVV`RP%%(^!o)yj6G$D%{{al_;IPhOU|<002dM|i
zgWLnM6BPC!xxWmI3>FNG4507=#VM#<2H6A36Xp!e;JgDWk6~<3c?@EM!VgpygTj=b
zfq?<$c5!f>#K6GA04kjr7$l%+2AtNQ>Ol5LGB7ZJ^uxkRiUFb)B>s<qi2=k%b{D9u
z2e}KBCqedu;tN#PgX|Y(U|@j7A*h@Hg&~X&Dq~=Lkefl}JBSZ+FQ}XWnF9(FkX{fU
z#0KdD<zEmRqz9B|Eg9IsajnY00It74>Oty2@*p>Z#F5<$s((Ok29+BicZxyX333Oh
zUIDoS<W5kY2h}YwK1d!^zrgq)zk=!#5Fg|okX}%k0%C*ofy#%U3``8V3=9k)dqDIz
z1{MZ=1_lOjV}OBy0VHn-l?Txv|AX?h5xD$fVA#mO3NA}b85kHqVxThS7Xu3eh_A=M
z05%I`Hi!+<3v!Dk0|U4of$^=OZ3++{6vs9U3=AN*_A!8Jd{7zz#S;SqNW2j$X2-z5
z05Zpxfq?<!ACNyGVvu|VD(66P4-sc(0EG)k3}%NT0|QtL#&?F=3Cou*3=9mQv<DL3
z0rjIR0|Ns{A4u*y12cm=D3TZ$7(o67$+<BwFnB@33dDw)4XUd^{sF}`hz$x4kUE&W
zH`Fb=p!WDOFff3`K;<gP9)BczKyrQz3=AMKkU1bW$XrmF3*v*sL2(9h8;B30VfF+;
z?Sb)wp?(I1DJa}S7#J8pVjy*(Fa^08BnC1Mlpa9lfoPC^P#Oq@rhx_qR&ae3&cMI`
c5(Aa@ApM{;1`-452c<2Leo)$ixfhh?0pDrWMF0Q*

literal 1020
zcmZQ(Qf6mhU}WHC;AN0wfB-=TCI&_Z1_o{hHZbk(6YQf`T#}+^Vrl?V!N<T1qQG+e
z4D1Xn3=CkLo0ypglHg=uVBle3U=Uzn28**ZFfcGPFf%YQFfbfq1gYg>aQBIK_xE@A
zag9$dD2OjEsmw`@&&kY7jZeueN=+`wEK3Ec<3LiEnU|bXnu4r=m4O9pKFnTL237`;
z-DyRM>CX8%`9%y23?MO(TS`(Zob&UGQb6tli3u<;F!&~x6lEr-7K6mt7}yv<Vjy-|
zW@>pseo+aC&BnkA76*k#NoH;;vKYue$%(n~1^LAcFm<4i0g0t#7BR3gFf#~&G%zqQ
zxHGVT-3AL|5Fg|&7~cbG4@kK(h+tq~fQf<Z28nSXiGl0}iGkb<QwOpeB&Gnij~VQ4
zkUEfEAa^K1&4uw5p?qNmCUD#+f@6sR%obx{W?*ArU;vpV&cMO|ibD_|6xRw2EDRvG
zfb0W_TSNJvum_2O)N?T~fc1my2dU>~0Hrbp29P*NJ%|tTKge$&_54uvApLUCxB#gI
z*$I*ZVURh33=sE${0%Y(#0U8eWREBV3xhD!%^-8Np?ndj-5~v<Q2iitLGmD43LFj%
z_GS#MV84U>2oeIh<p%>311kdqgDnFK*zLT~w9Ui72IliY%?9ZK$vHBxGJxz5V_*Qs
zJ;-j5UXVTF3=9k)agbgRUjnKZWClnMCN2pT2bl>{6Ue{{4ohhU1_qE?klSElGEgy)
ne*+lU!SN)^z`y`f3z7qw1@fOA12Z`Nf#m)&Ffv#$FfsrDaI;27

diff --git a/assets/shaders/ray.vert b/assets/shaders/ray.vert
index fae414f..78fbeb3 100644
--- a/assets/shaders/ray.vert
+++ b/assets/shaders/ray.vert
@@ -2,16 +2,21 @@
 
 layout (location = 0) in vec2 aCoord;
 
-layout (location = 0) out vec2 texCoord;
+layout (location = 0) out vec3 pos;
+layout (location = 1) out vec3 dir;
 
 layout (set = 0, binding = 0) uniform Matrices {
+	mat4 view;
 	vec2 viewport;
 	float time;
-	vec3 cam_pos;
-	vec3 cam_dir;
+	float focal_length;
 };
 
 void main() {
-	texCoord = aCoord;
+	vec4 p = view * vec4(aCoord.x * viewport.x/viewport.y, aCoord.y, 0.0, 1.0);
+	pos = p.xyz;
+	p-= view * vec4(0.0, 0.0, -focal_length, 1.0);
+	dir = normalize(p.xyz);
+
 	gl_Position = vec4(aCoord, 0.0, 1.0);
 }
\ No newline at end of file
diff --git a/assets/shaders/ray.vert.spv b/assets/shaders/ray.vert.spv
index 39540e7e5a52b007af8d7add0072ad8c8db9d887..c9c0626a1abe64ab6d1bd3407d95e0e043d46ef6 100644
GIT binary patch
literal 2132
zcmZQ(Qf6mhU}WHC;AL=UfB-=TCI&_Z1_o{hHZbk(6YQf`T#}+^Vrl?V!N<T1qQG+e
z44hy#3j+f~ZenI0h$G6tz@Wpxz+lP1z~I2Zz`)GF%)rFJz;K3<fq{jAi^1I|-re8d
z-N!XPxu77vxTG>CH9jXZFEu_TvnVyWB(p3Pq>ckgU1nZ#PH76V0#*hV24p)~8JNK?
zDPUk=U}a!s;9+23@J%c!%1llz2Dyn1Dh6VgWu}&cXf_5musV=mL1G2@MI{h%h<=cp
zOEPm)A!6)cwIH9T<tHcR#OI{urI%!Y<Un@wff!)BSr|b6Pjt@DFG>Nqg&7<c1^LAc
zAa$THNy#i?U}a!quw!6gNY9B6NG%FWEh<T^02u*t6G$Ay2Fc|YXO?8<=P|G`u!Gfu
z+zJ-Y%qt1btb)4@qzB~Q^qhF-oXi53%;J*7yyR54K9IXXa-}&ra5<2BK=A{z%Y%Uh
z>^~5jm4Si511Y?eL4s&v><kPH0!U&YcY)M_%!BC#xd$ZXfus)P4v?4+0|SFQ12fo8
zkUDn;76wolDnadn@fDHypm3E#;)Bu{G9MJSAU?<~AUA-*1f-lBL_pmD5(CMD#6UDm
z9mowJF_8OUVjwn143y45ZUyNDsS{>k0;gw1aLQ%?v&9&g8Q2&Y7!(*77{nP^7(n3z
z;)C=mFt9LiFff3{K;jbMTma#N<U#5|_JGub%$I|vOD=F8WB{8Bk^`B;%K)(tl)kMQ
zSQtQjP`H8gi88P-@I&1I@|!l44~i#H5P<XxLiK~p2JuB0K)D~3*BKZ<=7IR2a0clI
znI{G{52PPt9*8dv;(*0j7$l(jLGA;|gY1`vih<0Rf!YU?2k8fe5y*UydXTsp)I1np
z9n5dA2Zf6k1H}KJxB!`_4K7a@7(n76_k#GKbO4eE=?B?w2vq}<2c-*;ybJ>igDuoN
zkQ+eZ42n}woPgW`k^^CoJ@!yDK=L4SKzvZz2AKnrcZJG>^qMiSg3|yfE<sKQsrkXc
z!~n`iAibct2bGc_wT=v|44^m=VqgHLcTn8eLeqmV0|Ns{9Ha&mu96H4;Iaf1-XJv~
zH%c)uFo47z8Q2&=VJizY2NdSW>OlDbB-aWqX&4yf85kHqdO_kay`a1WN;@FEpzwg%
z0m_3QxelmaP<{pJ2Z_VnrUG>vvOZM?1_qFL00TQXt!pqaFo5)e#6fWkir0w@tYA4!
z1_lO@e?e;Opk+5m4CDq-IO#GlfXj1#1`cps>oG7efW$x;6vm+R14{ECy`cC9$%EVm
z3R`_>m>`EOsNw>NgVcb+%?PRnlvY4?g2L9Afq?-eUeCY+&T}RV3=AMKn14(e7#KkQ
z0AY|EvVY7N7#KiyfYgA@1Np%m>W5~ipDh>|7(ikmwIFwc(ga8hrrrvw9_D9j1_lO@
z7ziW#nTLT5940o<d<II3AhjSfL1`T%4l)x|rZ__5DG(Z$P7DkTATf}6FfnJS7${6(
resy7BU;wEF$$|U}@+&CpKz6x7>vd50g6stGLF)f9Ffv#$FfsrD)GLW7

literal 1304
zcmZQ(Qf6mhU}WHC;AK!^fB-=TCI&_Z1_o{hHZbk(6YQf`T#}+^Vrl?V!N<T1qQG+e
z3>;uK3j+f~ZenI0h{Fli%fKMaz`(%Fz|6qJz`$^Zk%57Qfs4W2C*IxP-`&SGKDnSE
zzPO|^CpA7NGcPqhC9^0sxg@hJ6{L;>NnK`Ma!zRqvI15H76xSdSQ%IuKz5d-RygP9
z7o~vQ08+!vz`&3Q6=7vyV-RFuU`Wr24@fNvOD!r%tpKTGgNlRLAi4bF%#zIfJO(xf
zcCdO-IDo}7^Gbp<t5QMgU~(XTrRT&u=VTVRWEPhs<|U`X^?^bNBv+b~1D9iEU<QW?
z$PAF1<rx?ld=pEGGLut_L1G}cfW$!Tvdq--g8ZTq5SxvGl>sCUa!W~OF4PSWF_0UQ
z6LaGW@{1W@>Ogjb#8NVg7(jL^f(&6`U~p$(0f&<u5+4*sFun%^E7;E<X^=RGhKYgf
z28n@am>9@zkQm55m>7r+5(CALI|DP=Jdiq&Jjf3qGnGLE0|Nt03}hxq43v^!Vjw*r
zF##lXAhSVY3Shr5gTn-*4&*P8A7SYi#s`UktP*Bm0;fSmaB5@#v&9&g8Q2&Y7(ix;
zGq5nQGcbVpAoCO$Siq?oWFJV}8p;QyF_0KYo{IsLYZ$=#K=L3y$loBpfXw5Cng<F8
zQ3e(UKB!$F_h>`;{7^Gw7+4rU{sg%PBqj$<lQ1(tav%({R|uS^7{K8QvKPdM<TC~a
zkUb($dqD00*#qK>f-GfVU;yz!c8H_#CBXa!dyx4uQ1d}{gZu$X8z4O(e}miwibGJC
zfW$y@APmw63P(`bf#gB%0`WoN4-zwDU<HRcC@er$fz0~Bz{J4Hz`$S&4SODFnPJDk
z3{ImUK1@ywDi_EA%Eb%}k_-$CATf|xFfl2p7|7oN4D1Xb_e(QC)Pm$deg^r|k%5%~
b<VRTsNcjW`8<3qKK1lsv21W)821W(|uH|Id