From fc7eec022ef7f87575d70640825749196023d3e9 Mon Sep 17 00:00:00 2001
From: clupus <154858@sch.bme.hu>
Date: Wed, 14 Apr 2021 22:52:52 +0200
Subject: [PATCH] Hianyzo oldalak javitva
---
Skeleton/Skeleton.cpp | 17 ++++++++---------
.../Skeleton.tlog/Skeleton.write.1u.tlog | Bin 86462 -> 88442 bytes
.../Skeleton.tlog/clang-cl.delete.1.tlog | Bin 168326 -> 172166 bytes
.../Skeleton.tlog/lld-link.delete.1.tlog | Bin 232134 -> 237450 bytes
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Skeleton/Skeleton.cpp b/Skeleton/Skeleton.cpp
index 6b868ae..162c36a 100644
--- a/Skeleton/Skeleton.cpp
+++ b/Skeleton/Skeleton.cpp
@@ -76,7 +76,7 @@ const char * fragmentSource = R"(
uniform vec3 wEye, v[20];
uniform int planes[objFaces * 3];
- uniform int planesAllPoint[objFaces * 12];
+ uniform int planesAllPoint[objFaces * 5];
uniform vec3 kd, ks, mirror, gold;
@@ -85,20 +85,19 @@ const char * fragmentSource = R"(
vec3 p1 = v[planesAllPoint[5 * i] - 1], p2 = v[planesAllPoint[5 * i + 1] - 1], p3 = v[planesAllPoint[5 * i + 2] - 1], p4 = v[planesAllPoint[5 * i + 3] - 1], p5 = v[planesAllPoint[5 * i + 4] - 1];
float d;
- d = length(cross( p2 - p1 , p2 - p)) / length(p2 - p1);
+ d = length(cross( p1 - p2 , p2 - p)) / length(p2 - p1);
if(d < 0.1f) return true;
- d = length(cross( p3 - p2 , p3 - p)) / length(p3 - p2);
-
+ d = length(cross( p2 - p3 , p3 - p)) / length(p3 - p2);
if(d < 0.1f) return true;
- d = length(cross( p4 - p3 , p4 - p)) / length(p4 - p3);
+ d = length(cross( p3 - p4 , p4 - p)) / length(p4 - p3);
if(d < 0.1f) return true;
- d = length(cross( p5 - p4 , p5 - p)) / length(p5 - p4);
+ d = length(cross( p4 - p5 , p5 - p)) / length(p5 - p4);
if(d < 0.1f) return true;
- d = length(cross( p1 - p5 , p5 - p)) / length(p1 - p5);
+ d = length(cross( p5 - p1 , p5 - p)) / length(p1 - p5);
if(d < 0.1f) return true;
}
@@ -342,7 +341,7 @@ void onInitialization() {
std::vector<int> planesAllPoint = {
1, 2, 16, 5, 13, 1, 13, 9, 10, 14, 1, 14, 6, 15, 2, 2, 15, 11, 12, 16, 3, 4, 18, 8, 17, 3, 17, 12, 11, 20, 3, 20, 7, 19, 4, 19, 10, 9, 18, 4, 16, 12, 17, 8, 5, 5, 8, 18, 9, 13, 14, 10, 19,7, 6, 6, 7, 20, 11, 15
};
- for (int j = 0; j < planes.size(); j++) { shader.setUniform(planesAllPoint[j], "planesAllPoint[" + std::to_string(j) + "]"); }
+ for (int j = 0; j < planesAllPoint.size(); j++) { shader.setUniform(planesAllPoint[j], "planesAllPoint[" + std::to_string(j) + "]"); }
shader.setUniform(vec3(0.1f, 0.2f, 0.3f), "kd");
shader.setUniform(vec3(5, 5, 5), "ks");
@@ -363,7 +362,7 @@ void onDisplay() {
glutSwapBuffers();
}
-// Key of ASCII code pressed
+
void onKeyboard(unsigned char key, int pX, int pY) {
if (key == 'd') glutPostRedisplay();
if (key == ' ') move = !move;
diff --git a/Skeleton/grafika/Skeleton.tlog/Skeleton.write.1u.tlog b/Skeleton/grafika/Skeleton.tlog/Skeleton.write.1u.tlog
index 03c682e7a84dd6c2cdd7602a5443710c1aa3cd8a..2a3e05cd9c8dc96b968b7d68a77143d1ee3139cb 100644
GIT binary patch
delta 16
YcmdnDnDy5t)`l&N`vNyVVBW(H07d@?wEzGB
delta 11
ScmeyhiFMy%)`l&N`vL(YjRjl)
diff --git a/Skeleton/grafika/Skeleton.tlog/clang-cl.delete.1.tlog b/Skeleton/grafika/Skeleton.tlog/clang-cl.delete.1.tlog
index fd2f74a13975d24b509d8d4d8f3f0ed035635d15..770832d5762ebda06365a545c0dbf37e773983c1 100644
GIT binary patch
delta 522
zcmZo$%++>~tD%K)3sc*~&28CAjFyQE$qdE}X$*!8CJe?5CJbo|<_ty*CJcrQ$qXh8
zmJEgrMhq4V#tfzmCJZJFMhwObsSIfhMhvE#AI@WB<Tqe&VK8TKW^iJ#U@%~C-CSsC
z&S;s;V9H<#Qp1qSV8&p;V8M{YV8CF)kjP-cV8&p{V9AigV8&p~kjRk4V8md^V8D>d
zkO;D2^TSw1Mt&0pC#Z?W43-S$n+vne87)&762bb77?K&x87vq~!RCY9WC=DY8Eldn
zLkdF**nCR{Q;5mi6Xh5g8Tk#tdW;!d84MZB8H_g<N}Gc`4|0k*LkdG0Ln4DALn?z2
zgE`cji3}hk%ox%bQW#7bEWklz!H~+3%#g;AwE5voMn--&21^Dr29R@I8Qd6*HW!A2
z%`{=K06Wr<0pv7GhD3%mu$dr>K>=XKkPJ3EnE_-T$n0bWGls;?4|5n9`JEVC!9H_g
zFkmnMnF$I|Lk3fD02(u-Fr+dVf?U9m2#&Bsh7<-1h7_<ED5A{4;wcP9U>htpCoTm0
R9b}dz$lst)p8SzT6adPuS26$q
delta 13
UcmZoW$kn!(tD%K)3sc)f04A&jR{#J2
diff --git a/Skeleton/grafika/Skeleton.tlog/lld-link.delete.1.tlog b/Skeleton/grafika/Skeleton.tlog/lld-link.delete.1.tlog
index 221c83a08f3376c644bc80c77e3ae3cd0c7cb3e8..d3ce7fd5611fcb6905a83dabf60d3fd63679e77c 100644
GIT binary patch
delta 619
zcmX>$m9J|*UqcIH3)2?nV_lnXSSc{trZ5;Vm@pVJq%oK>7%&(zBr%vWq%jyXm_S*H
z3`q>h49N_s49N_ZU@;4Z6b4fU3x;F{lg*0G&5Ybe3}y^242BG*45pI}zgBWPGZ-*f
zFt{>UGB|Dzyv(G|Xq(Jn#*oTj%3#Tm#$d=`!C=IY47SdMA(g?H!GOV%!3->8$Y9Qp
z%8<s8%3#O<GBugOgu!z2#kgihZgU1>1{Ves1~&$m>58#TmE4XDCJZJFE+9v5f9S!a
z&S;*(U<CF+5`#H|8AA$#8AB3-C4&)z2}2s#1C}7u7%aeYX<)BdG8i(LY+o<Q*vZK4
z2zE8d64S{S_f~ToFt{=pGdMChF&J<Ec!Eit(b|~7jKPq>3~VAO*pe7h86akY0x*%m
zfWe3%ks$@_OHhENFc>o=Gk}82V)Mg|;DB;tuw*b`FlVrwUg*eF$?d{m$>79b%3#Rg
z1_~)nM(bn-W4L}31|tSjhExV~1`~!9hC~JvFg9T@2a8&O4KfG&4HR9e;K<;0VsK+{
zWiVkdW3XhfoZiUBSjq0h;LKpgV6wSUQ<Krw9PA)akeD%;F&Hp_0s<88Cg31SV@L!?
zj4?wBICw#hNo6nqrx6PVqwNb77{PJj$l%7{1ajWw!nR5wX9f!fO9oR0M+PGXCk9>y
GE(QQyb8j91
delta 15
WcmeC$&v$GpUqcIH3)2?nV_g6=Kn7C)
--
GitLab