From efcb0d44922fca5e159ac49458030279dce6c51a Mon Sep 17 00:00:00 2001 From: Hoguchi-live Date: Sun, 15 Jan 2023 01:57:56 +0100 Subject: [PATCH] Updated static functions --- .../clangd/index/main.c.4CB5CE34A69A03F5.idx | Bin 3444 -> 3398 bytes src/gfx/window.c | 88 ++++++++++-------- 2 files changed, 48 insertions(+), 40 deletions(-) diff --git a/.cache/clangd/index/main.c.4CB5CE34A69A03F5.idx b/.cache/clangd/index/main.c.4CB5CE34A69A03F5.idx index 0af9316ec744f1323998a82f8097395a6330aeab..24bef8dfeeaad0db833996c85c7ab5a1a29a5d0f 100644 GIT binary patch literal 3398 zcmY*b2UJs88h*fwB;kcn0%(AQ6apauBB7_CD2jtpBqqATBuMoDg93s&C@KiLjtCYU zI~!#!tGig{h}coEgE*)wAm|x%RS*kf869!|;NA!O&dE9Xzx$W(e*bMVr%jonW?48v^UmzSSA|GgQ8#R0H*=a!9$IUO=q*|J;zs%!tARr==op~O1o!A;@i z?FF;SH7~t#`#1GcuT;2LK07q@;Q{WYJ+UaE_ww@AJarZ~ch!^^TC*>kKQFvz)b4#7 z^(tal%dgLuZM<3B?f(4a_cb8x{H5jdvp98`c%u38ec)-&kG{;9nY#0EsK*r^o>c;8kn?Oicj`PN*epOfS4_|JZ>Pj~P&$;ve0HBoli-=m@ef9?1~TD57;$Lh(| zZcgIhbk}Qfmr4hNHah*W-FLO?mMgCx*cP4nm@%Z7_hXmfQRRcR^kado7i$?qtNf?0 zZ7EH#@qbqGM!0cbfwnB@r{fCwqQ12jdoNUdyzcq@j?q|RUc|nr@pRDtd3aN;{%gop zQG0)}F#Aa3no4R_&)upev+|Z?&+CCz;1cj;N2m|mhrrx1j2}gbqVdO2#?WA7_?yg# z9LrF&w-J~ShJz?U9D$0W;$Sq2IVN>A6POhkmmS%B@jyI*alj$mKAgj+*i+#Dx9?Pi zu!6mm%OWrd498GntoW7`ODi9tbw zxgm?d#Nd!XNwDHmDO584i|)mbk87D_1m*$5R=5>aAi_mdjAn_OiClmlmYbTEcNeCE zU*AyfRnu;5M(|a*$_5dja0c>MoDIbRw#V(6C?AD4_Uy|g6XgJ>QPV_-1>K16Z8~3a z7+^=HBL{g~Tb#Jxj1_4Cju1rzB1x=e<&|lH{(S%^@)M;fiFH^%RaRxN1z1Pu91#jYrpPdtX#NyzbQDaVi|Y_ z@radalSz7p+BEL^Wn1A8aE+iwSfd3QTGnh|wPcMGz)5%#xd&8pyIRcx27Un9Io6!9 zBgC{S?Nl`V3H6hdYaL425NpSrju4ot2};L6#=lsRpO1jv)cRjw9ev&0<0yp?nuW4O}4`0u?41c$c^UahLYquWS)qO zu09QLCZ5SedgPtyF-G`C769xm_9k=Z-J;b9i--m|G}O4-5sA8J+d@V@YtY1m$zYO= zMr#PplF{co>^7>OJ=zTP;R^tfUn;EskZ}88GY*+>CLOVaed`eGjHUvc%vC2CWqIq! zJ-z%`n||e+ibFsp$u`Lq3DnF$B@dXbXI{Pb?kC`7x+_o;SiEpoAnWAd;|Z^4yf1-R zy_4Pz5kNVhk)v;7=#e*5j_T5fuWFR3;YrM~*1G}qkV%LO?UB<3ak5WQ)8GeyWzI5E z`AZWgCaln-Mu>u8-Bu>CZ?8b3q>7PgOe{D_t2o92f?ZXCXM_F{@n z1{BbF=_JVMMuXAk!Ralz0BaZ;5rW&k>+jnz*{%`bOt(z(&PHp~oId=%Ky!j-;jt_f z+o?U;t!-Pm8DhimuyM%gp=+X`GNVThI*T2}ZYUMO58?)qNA^R5JmXDGUpK@i;)&$0 z>pn;+F&>XvX9));ZZ~T6+uPVXA_+lImXO?Iz{x$9oF>f9L*tDYf=(i>bi_*YNb^QI z^{jlczpeDE5@<@PQo9kFGOCQUdPAFz8P#_hfTlOqo1Dv&ueYam?OeJLV5LMk8Lj-6 zTZ@a6Bg!WM?2fyW@1hSa58I3UZ&9JQrdJg5{&ba7^U1@Gi_`M8l7Rqa&UH{j>G;7 Dtq4J= literal 3444 zcmY*b2UHW;8XjOGNtlF?gccIY1StUlO(+S7ow77zLQ@oxgrEzH0)o0IDhRr+2o_vB zFUne;zK3Oxh#dtxh>Q9tf}RDB3Swa`t1G-ecy7YZIhoA&-M`=emRaE;AsGw|o2Ck1 zmZ{E7!7&W8fL~5-_QDTF7$yf|*`DoN=4Q3~a7$L+{cla{JZ|yZTSw>Cm>=0XwX`)a zwp95_l-<9zhkCt?Z~FY`(8o4h6nA=QQqQ$j%{jpt4%ur%Ud9=H-S%b4Lv7rFcM-2= z>}~q}#mX&r3cJR>I5RJ6b7f=S`VZ0Ep7hm2zZ6Dk{CC8M*W^FC8I>J)X;1UT?g5H# z@E=bjPOvG(^Rx3l=LVmx+ZTN7p4&NX(ZF!f!9y{B(0DQNhYQZOUFzaUA(T7yuYhakw_0UEvoVs=Kr!dEV=!8j=1b!Es+8Hk@$v({IA0_UQX@^b0xolG5Vp#$%_Ftm@iRwaWB=F%K5J|E`_8 zf;HRpdryzZ+dS_e<@}(crLU?M-s9Cfr&QMPw)xm!bqUDmbM{#`knCKm86~T>&>e)}%S#bjd9FH6p_A_x8U$E4C(ns+?Zw zXzd=L5!{qtEgtmWV*S@H?{$Lh*Wa{R6rBH*J`}j%$4=ps^0p21lYY%tsu@FTC6ODN zij!E9=S6Rww;ariEAjvNRG@fi-v*Ndmn%Nqa(i)Kt1U7v;9XI=StkE|Y-@G$u=IvY zYk#40=JERV<bCzc==!P!f`}XdZdGWjmY%GS6rW8}!$O}eBp6QG*8%AJj z3xPSqa55#?UO165(H^5wj4@AvkPNhMuS6m%_qpy5){F`$FZgYA(t z)8zD{MywzX=uDSPKU5N?Pic9YpQI0HThi7O8DUQ9r}|XPw*Z<$aI8=ytcaooj4x+O zjd7BX^DU4xPO5N~1)2t{wb!2=|11pX>rf4yQe82?IeNT`1SyDmB3UY6fO*h$|IEM zohUXSwOYLpA;HSGvFIjP)H z3Nlvx-rsiS4?(P%)J!I7NLfiEr(*efYoGdT(U4n+wQWC$}v zU*E~K(}Ffw7V|*YpW&~M33)W4k8BQT%A(J|^S7PgMT4?4sZ6H9q$AalX~=fN=G_50loslY93;$A`v_x_0wD^uPz{^fw+B#!T8@zF z;r46Sc0V)M=}rihB3-rL{_PJgy(WNG2o&RxbVh6c{^nQ*8PIHkJr)&vaf5~PshN4Y z%_@u*=7@}BTYi5!EV}X>(5|?vIVwZW`EKnD@31_eW8Gu*wsY>%s+`?Hq z_5>W^C^U{UYT-+82_5CL>SRmunzv;~ArygyK!EHPGaAHG<(Y4w&S}P^|3bwDTWmNo&^qB1|rJo9a? zA9&)7<+zWE*_R_lXxBB9SB0OSJAf`BAoPjta|+*px!(~1ZOgNDLX)w-Huzz9$5j>3 zN;{Z&k&dHKtV>J zmEk}^=*-~L$#0@Q6oIatwVfjh0NH?(Lw9B)X_)PC5;5{y*Bf)P`GIdO=tkm^97JDs zPxUHj82kuyf?a~X)>o%YNm{*oei?LgGDe#a8}oFElf);JUe6vc(@ zX+ZwCzkV6O{e=}^h0=he=u(ye$(S;(0Y!2n^-H#U&C5eA#lt}mw34c18-h-tCg@R* ztl^|K_FSK*diX}j+JXF)sf_Sx~urPH-=`^6D@F@MA>SNR6)&j|0 zDl~xZ28N_R->|Rx?CPZ}h#hW6puYGb<`y0q?3@hJx*8*CGz^WYy9}bzLu2|%0#SzO z9}Xqml@JNRT`(g>2XeAga{_fA`W+p^9Ci5HU@>X=hEf#r_Y>YhsE3 diff --git a/src/gfx/window.c b/src/gfx/window.c index dd53f04..a5d9e52 100644 --- a/src/gfx/window.c +++ b/src/gfx/window.c @@ -3,22 +3,14 @@ #include #include -static void _size_callback(GLFWwindow *handle, int width, int height) { - glViewport(0, 0, width, height); - window->size = (ivec2s) {{height, width}}; +static void _init(); +static void _update(); +static void _render(); +static void _destroy(); +static void _tick(); - window->size.x = width; - window->size.y = height; - glBindTexture(GL_TEXTURE_2D, renderer->screen_textureColorbuffer); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); - glBindRenderbuffer(GL_RENDERBUFFER, screen_rbo); - glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height); -} - - -static void _error_callback(int code, const char *description) { - fprintf(stderr, "GLFW error %d: %s\n", code, description); -} +static void _size_callback(GLFWwindow *handle, int width, int height); +static void _error_callback(int code, const char *description); struct Window *window_create(FWindow init, FWindow destroy, FWindow tick, FWindow update, FWindow render) { struct Window *window = malloc(sizeof(struct Window)); @@ -73,31 +65,6 @@ struct Window *window_create(FWindow init, FWindow destroy, FWindow tick, FWind return window; } -static void _init() { - window->init(); -} - -static void _destroy() { - window->destroy(); - player_destroy(player); - renderer_destroy(renderer); - glfwTerminate(); -} - -static void _tick() { - window->ticks++; - window->tick(); -} - -static void _update() { - window->update(); -} - -static void _render() { - window->frames++; - window->render(); -} - void window_loop() { _init(); @@ -137,3 +104,44 @@ void window_loop() { _destroy(); exit(0); } + +static void _size_callback(GLFWwindow *handle, int width, int height) { + glViewport(0, 0, width, height); + window->size = (ivec2s) {{height, width}}; + + window->size.x = width; + window->size.y = height; + glBindTexture(GL_TEXTURE_2D, renderer->screen_textureColorbuffer); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + glBindRenderbuffer(GL_RENDERBUFFER, screen_rbo); + glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height); +} + +static void _error_callback(int code, const char *description) { + fprintf(stderr, "GLFW error %d: %s\n", code, description); +} + +static void _init() { + window->init(); +} + +static void _destroy() { + window->destroy(); + player_destroy(player); + renderer_destroy(renderer); + glfwTerminate(); +} + +static void _tick() { + window->ticks++; + window->tick(); +} + +static void _update() { + window->update(); +} + +static void _render() { + window->frames++; + window->render(); +}