TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-27 23:34:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2023-08-02 08:09:26 +02:00
commit cc861cdaa1
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,6 +17,7 @@ vgcore.*
*.save.1
*.sublime-workspace
.vscode/
.idea/
# Temporary build files
/_vfsimporter.*

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

@ -101,6 +101,15 @@ set_color(const LVecBase4 &color) {
_has_color = true;
}
/**
* Unsets the color of the card.
*/
INLINE void CardMaker::
clear_color() {
_has_color = false;
_color.set(1.0f, 1.0f, 1.0f, 1.0f);
}
/**
* Sets the flag indicating whether vertices will be generated with normals or
* not. Normals are required if you intend to enable lighting on the card,

1
panda/src/grutil/cardMaker.h
View File

@ -49,6 +49,7 @@ PUBLISHED:
INLINE void set_color(PN_stdfloat r, PN_stdfloat g, PN_stdfloat b, PN_stdfloat a);
INLINE void set_color(const LColor &color);
INLINE void clear_color();
INLINE void set_has_normals(bool flag);

2
panda/src/text/textAssembler.h
View File

@ -25,7 +25,7 @@
#include "textPropertiesManager.h"
#include "textEncoder.h"
#include "geomVertexRewriter.h"
#include "epvector.h"
#include "pmap.h"
typedef struct hb_buffer_t hb_buffer_t;