From 3815da82430df2c1ed44858da3d8425946539b04 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Mon, 16 May 2016 08:43:29 -0400 Subject: [PATCH] added jump page, quest light --- Makefile | 2 ++ assets/pages/gootaJump.png | Bin 0 -> 10573 bytes assets/questlight.png | Bin 0 -> 235 bytes brice.dat | 4 ++-- src/entities.cpp | 30 +++++++++++++++++++++++++++--- src/ui.cpp | 4 ++-- xcf/questlight.xcf | Bin 0 -> 994 bytes xml/playerSpawnHill1.xml | 3 ++- 8 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 assets/pages/gootaJump.png create mode 100644 assets/questlight.png create mode 100644 xcf/questlight.xcf diff --git a/Makefile b/Makefile index 929dc66..7c05c95 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,8 @@ clean: cleandata: rm -rf xml/*.dat rm -rf storyXML/*.dat + rm brice.dat + touch brice.dat $(EXEC): $(CXXOUTDIR)/$(CXXOBJ) main.cpp @echo " CXX/LD main" diff --git a/assets/pages/gootaJump.png b/assets/pages/gootaJump.png new file mode 100644 index 0000000000000000000000000000000000000000..f9c605a55bf2ae6830537c0b2f6a3969d43560f5 GIT binary patch literal 10573 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 RzlV>2XPP=1m1?$8{{yljaMl0- literal 0 HcmV?d00001 diff --git a/assets/questlight.png b/assets/questlight.png new file mode 100644 index 0000000000000000000000000000000000000000..d09ca7d138db4304cdb05d7721dca35af7920652 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1k!3HFMt$j8RNUASfQ*vO42dXl&d<$F%_{+N85o?4QWHy3 zQxwWGOEMJPJ$(aG^itV@;{Kj4jv*Y^b9*=PHW)A*mO1z0%o)enpEGtA-#2j9oGNhh zk&9;t!=x2#3Du6;DuN0P+YW_%vzryKTk(~DkCjX+>-pX3Yx!RPSJT>DdTrGy-Xl{r Um!9tE{{XVn)78&qol`;+08W}q{Qv*} literal 0 HcmV?d00001 diff --git a/brice.dat b/brice.dat index ea71945..61d57c2 100644 --- a/brice.dat +++ b/brice.dat @@ -1,5 +1,5 @@ 2 -canSprint -0 canJump 0 +canSprint +0 diff --git a/src/entities.cpp b/src/entities.cpp index 73e7808..8dc32e2 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -336,9 +336,28 @@ bool Entity::isNear(Entity e) { void NPC::drawThingy(void) const { if (dialogCount) { - auto w = width / 3; - glColor3ub(255, 255, 0); - glRectf(loc.x + w, loc.y + height, loc.x + w * 2, loc.y + height + w); + const auto w = width / 3; + GLfloat tex_coord[] = { + 0, 0, 1, 0, 1, 1, + 1, 1, 0, 1, 0, 0 + }; + const GLfloat c[4] = { + loc.x + w, loc.y + height, loc.x + w * 2, loc.y + height + w + }; + GLfloat coords[] = { + c[0], c[1], z, c[2], c[1], z, c[2], c[3], z, + c[2], c[3], z, c[0], c[3], z, c[0], c[1], z + }; + + glUseProgram(worldShader); + glEnableVertexAttribArray(worldShader_attribute_coord); + glEnableVertexAttribArray(worldShader_attribute_tex); + glVertexAttribPointer(worldShader_attribute_coord, 3, GL_FLOAT, GL_FALSE, 0, coords); + glVertexAttribPointer(worldShader_attribute_tex, 2, GL_FLOAT, GL_FALSE, 0, tex_coord); + glDrawArrays(GL_TRIANGLES, 0, 6); + glDisableVertexAttribArray(worldShader_attribute_coord); + glDisableVertexAttribArray(worldShader_attribute_tex); + glUseProgram(0); } } @@ -874,6 +893,11 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y) { return 0; } +/*Particles::Particles(const Structures *&s, vec2 vell, Color c, float d, ) +{ + +}*/ + Particles::Particles(float x, float y, float w, float h, float vx, float vy, Color c, float d) { loc = vec2 {x, y}; diff --git a/src/ui.cpp b/src/ui.cpp index a8d37d0..a5bc2d7 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -1437,9 +1437,9 @@ EXIT: 0.0, 1.0, 1.0, 1.0}; - GLfloat backdrop[] = {offset.x - SCREEN_WIDTH / 2, offset.y - SCREEN_HEIGHT / 2, 1.0, + GLfloat backdrop[] = {offset.x - SCREEN_WIDTH / 2 - 1, offset.y - SCREEN_HEIGHT / 2, 1.0, offset.x + SCREEN_WIDTH / 2, offset.y - SCREEN_HEIGHT / 2, 1.0, - offset.x - SCREEN_WIDTH / 2, offset.y + SCREEN_HEIGHT / 2, 1.0, + offset.x - SCREEN_WIDTH / 2 - 1, offset.y + SCREEN_HEIGHT / 2, 1.0, offset.x + SCREEN_WIDTH / 2, offset.y + SCREEN_HEIGHT / 2, 1.0}; glUniform1i(textShader_uniform_texture, 0); diff --git a/xcf/questlight.xcf b/xcf/questlight.xcf new file mode 100644 index 0000000000000000000000000000000000000000..b93b4ae1399e3c6670fc34a396bd0aed69e4c7d7 GIT binary patch literal 994 zcma)4yKdVs6eXoLNu4-O)5joW;AjJN;H(|fA?OgGKsRqPP02*`FeDj?r=Wk({)mUp z{fK;khK`+r%taCPT#0mL)CGEtLmi!aE=k|3P{(s|BLflWNHN4y;29CbbAWR!FMz%C z&x{ceFM%h31H3kze6QfYz_S}-+o4S3SS1DC86}V3Wy&wqR9x#~CNADzexS@zZPl?K zs$rPvDQR$X*3XM&q(q)ZdOGOzgHWbXnu&h>7-r$b7o*cr9b3qmNexgs*-~or;@^Zy zZ}Pb>brOm*dltmyHqmIqMWPF#6FE~k)u%y_t73gYs{UJQl+9A=g9-k%A?{lv*cnk* z_s@NK6=vxosar=Aq1XXvLKU!QIN52mq*I&#mUmiwzr_z)yxZbEaN5_#E{NT${dJhU z6B}Z$4zKfRQ**x1JFgyD#jBsVIext2%vs|Bl4Mo0NG6ds<`S8bmoNiA%2mnOs$4-F zlbx0^8~?F;$avg?9r)!j58vCpN8Q@=v&RYd!4 literal 0 HcmV?d00001 diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml index d886df8..7be0e08 100644 --- a/xml/playerSpawnHill1.xml +++ b/xml/playerSpawnHill1.xml @@ -17,7 +17,8 @@ - + + -- 2.39.5