TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix CardMaker for y-up

Browse Source
This commit is contained in:
David Rose 2012-03-02 14:53:36 +00:00
parent c9f9eba3fc
commit f9faceee5b
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panda/src/grutil/cardMaker.I
View File

@ -63,10 +63,10 @@ set_has_3d_uvs(bool flag) {
////////////////////////////////////////////////////////////////////
INLINE void CardMaker::
set_frame(PN_stdfloat left, PN_stdfloat right, PN_stdfloat bottom, PN_stdfloat top) {
_ll_pos.set(left, 0.0f, bottom);
_lr_pos.set(right, 0.0f, bottom);
_ur_pos.set(right, 0.0f, top);
_ul_pos.set(left, 0.0f, top);
_ll_pos = LVector3::rfu(left, 0.0f, bottom);
_lr_pos = LVector3::rfu(right, 0.0f, bottom);
_ur_pos = LVector3::rfu(right, 0.0f, top);
_ul_pos = LVector3::rfu(left, 0.0f, top);
}
////////////////////////////////////////////////////////////////////
@ -85,8 +85,7 @@ set_frame(const LVecBase4 &frame) {
// Description: Sets the size of the card.
////////////////////////////////////////////////////////////////////
INLINE void CardMaker::
set_frame(const LVertex &ll, const LVertex &lr, const LVertex &ur, const LVertex &ul)
{
set_frame(const LVertex &ll, const LVertex &lr, const LVertex &ur, const LVertex &ul) {
_ll_pos = ll;
_lr_pos = lr;
_ur_pos = ur;
@ -101,9 +100,8 @@ set_frame(const LVertex &ll, const LVertex &lr, const LVertex &ur, const LVertex
// as a fullscreen quad.
////////////////////////////////////////////////////////////////////
INLINE void CardMaker::
set_frame_fullscreen_quad()
{
set_frame(-1,1,-1,1);
set_frame_fullscreen_quad() {
set_frame(-1.0f, 1.0f, -1.0f, 1.0f);
}
////////////////////////////////////////////////////////////////////

14
panda/src/grutil/cardMaker.cxx
View File

@ -29,18 +29,8 @@
////////////////////////////////////////////////////////////////////
void CardMaker::
reset() {
_has_uvs = true;
_has_3d_uvs = false;
_ll_pos.set(0.0f, 0.0f, 0.0f);
_lr_pos.set(1.0f, 0.0f, 0.0f);
_ur_pos.set(1.0f, 0.0f, 1.0f);
_ul_pos.set(0.0f, 0.0f, 1.0f);
_ll_tex.set(0.0f, 0.0f, 0.0f);
_lr_tex.set(1.0f, 0.0f, 0.0f);
_ur_tex.set(1.0f, 1.0f, 0.0f);
_ul_tex.set(0.0f, 1.0f, 0.0f);
set_frame(0.0f, 1.0f, 0.0f, 1.0f);
set_uv_range(LTexCoord(0.0f, 0.0f), LTexCoord(1.0f, 1.0f));
_has_color = false;
_color.set(1.0f, 1.0f, 1.0f, 1.0f);