From 3c9aea1ee129c519b82625507e7f031c453f0dbf Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 2 Aug 2023 07:51:46 +0200 Subject: [PATCH 1/3] text: Fix missing epvector.h include in textAssembler.h --- panda/src/text/textAssembler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/text/textAssembler.h b/panda/src/text/textAssembler.h index 2cbede0d10..20f9b2c1e5 100644 --- a/panda/src/text/textAssembler.h +++ b/panda/src/text/textAssembler.h @@ -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; From 9fd39e1aef94f47ddf5296051fd32fd6ece67168 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 2 Aug 2023 07:56:24 +0200 Subject: [PATCH 2/3] Add .idea to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0b40b42f79..8dada724d7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ vgcore.* *.save.1 *.sublime-workspace .vscode/ +.idea/ # Temporary build files /_vfsimporter.* From 262bde3082eefad93581bdfee098e8fe9197e1fd Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 2 Aug 2023 08:08:25 +0200 Subject: [PATCH 3/3] grutil: Add clear_color method to CardMaker --- panda/src/grutil/cardMaker.I | 9 +++++++++ panda/src/grutil/cardMaker.h | 1 + 2 files changed, 10 insertions(+) diff --git a/panda/src/grutil/cardMaker.I b/panda/src/grutil/cardMaker.I index b960808ca0..2f8a17a7dc 100644 --- a/panda/src/grutil/cardMaker.I +++ b/panda/src/grutil/cardMaker.I @@ -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, diff --git a/panda/src/grutil/cardMaker.h b/panda/src/grutil/cardMaker.h index 426fc2d5c5..0ac90f2316 100644 --- a/panda/src/grutil/cardMaker.h +++ b/panda/src/grutil/cardMaker.h @@ -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);