Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

transforming every vec2 into vec2<float> and GenericVec2<T> into vec2<T> #240

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open

transforming every vec2 into vec2<float> and GenericVec2<T> into vec2<T> #240

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2cc1f14
templated in ui.cpp
Duskhorn Jan 22, 2022
e3d62e9
templated in animmodel.h
Duskhorn Jan 22, 2022
aff6700
updated .gitignore
Duskhorn Jan 22, 2022
209b221
md5.h and obj.cpp
Duskhorn Jan 22, 2022
5304855
used new vec2 template instead of genericvec2
Duskhorn Jan 22, 2022
183a574
used new vec2<T> instead of GeneriVec2
Duskhorn Jan 22, 2022
0be2eea
more vec2<float>
Duskhorn Jan 22, 2022
b792f97
aa.cpp
Duskhorn Jan 22, 2022
49b055b
csm.cpp
Duskhorn Jan 22, 2022
37ce06b
grass and hud :)
Duskhorn Jan 22, 2022
637cd7b
octarender, radiancehints and rendergl
Duskhorn Jan 22, 2022
a79ac36
renderlights
Duskhorn Jan 22, 2022
c2b9c91
renderlights part 2
Duskhorn Jan 22, 2022
efbf230
renderparticles
Duskhorn Jan 22, 2022
e755b8b
renderparticles part 2
Duskhorn Jan 22, 2022
615af3f
renderva
Duskhorn Jan 22, 2022
55fffcf
stain.cpp and texture.h
Duskhorn Jan 22, 2022
7ded47c
bih.cpp
Duskhorn Jan 22, 2022
d9ed9d9
bih.h
Duskhorn Jan 22, 2022
02d1a3a
octaedit.cpp
Duskhorn Jan 22, 2022
82f3821
physics.cpp
Duskhorn Jan 22, 2022
c0070c1
geom.cpp and glemu.cpp
Duskhorn Jan 22, 2022
ea15fcb
fixed merge
Duskhorn Jan 23, 2022
3cb0d36
Merge branch 'project-imprimis:main' into vec2
Duskhorn Jan 27, 2022
692b489
Merge branch 'project-imprimis:main' into vec2
Duskhorn Jan 28, 2022
6fd9a94
Merge branch 'project-imprimis:main' into vec2
Duskhorn Jan 31, 2022
9304b6b
Merge remote-tracking branch 'origin' into vec2
Duskhorn Feb 2, 2022
84302ff
Merge branch 'project-imprimis:main' into vec2
Duskhorn Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
renderparticles part 2
  • Loading branch information
@Duskhorn
Duskhorn committed Jan 22, 2022
commit e755b8b9a6eb5845a3fc187eb41cc45e54dd1faa
12 changes: 6 additions & 6 deletions src/engine/render/renderparticles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ void genrotpos(const vec &o, const vec &d, float size, int grav, int ts, partver
vec2( 1.f, -1.f).rotate_around_z(n*2*M_PI/32.0f), \
vec2(-1.f, -1.f).rotate_around_z(n*2*M_PI/32.0f) \
}
static const vec2 rotcoeffs[32][4] =
static const vec2<float> rotcoeffs[32][4] =
{
ROTCOEFFS(0), ROTCOEFFS(1), ROTCOEFFS(2), ROTCOEFFS(3), ROTCOEFFS(4), ROTCOEFFS(5), ROTCOEFFS(6), ROTCOEFFS(7),
ROTCOEFFS(8), ROTCOEFFS(9), ROTCOEFFS(10), ROTCOEFFS(11), ROTCOEFFS(12), ROTCOEFFS(13), ROTCOEFFS(14), ROTCOEFFS(15),
Expand Down Expand Up @@ -898,10 +898,10 @@ struct varenderer : partrenderer
v1 = v1c, \
v2 = v2c; \
body; \
vs[0].tc = vec2(u1, v1); \
vs[1].tc = vec2(u2, v1); \
vs[2].tc = vec2(u2, v2); \
vs[3].tc = vec2(u1, v2); \
vs[0].tc = vec2<float>(u1, v1); \
vs[1].tc = vec2<float>(u2, v1); \
vs[2].tc = vec2<float>(u2, v2); \
vs[3].tc = vec2<float>(u1, v2); \
}
if(type&PT_RND4)
{
Expand Down Expand Up @@ -1742,7 +1742,7 @@ static void regularshape(int type, int radius, int color, int dir, int num, int
vec to, from;
if(dir < 12)
{
const vec2 &sc = sincos360[randomint(360)];
const vec2<float> &sc = sincos360[randomint(360)];
to[dir%3] = sc.y*radius;
to[(dir+1)%3] = sc.x*radius;
to[(dir+2)%3] = 0.0;
Expand Down