diff --git a/panda/src/pgraph/alphaTestAttrib.h b/panda/src/pgraph/alphaTestAttrib.h index 8d620e66e7..5c38727347 100644 --- a/panda/src/pgraph/alphaTestAttrib.h +++ b/panda/src/pgraph/alphaTestAttrib.h @@ -36,6 +36,10 @@ PUBLISHED: INLINE PN_stdfloat get_reference_alpha() const; INLINE PandaCompareFunc get_mode() const; +PUBLISHED: + MAKE_PROPERTY(reference_alpha, get_reference_alpha); + MAKE_PROPERTY(mode, get_mode); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/antialiasAttrib.h b/panda/src/pgraph/antialiasAttrib.h index 146561407d..30a72bb535 100644 --- a/panda/src/pgraph/antialiasAttrib.h +++ b/panda/src/pgraph/antialiasAttrib.h @@ -52,6 +52,11 @@ PUBLISHED: INLINE unsigned short get_mode_type() const; INLINE unsigned short get_mode_quality() const; +PUBLISHED: + MAKE_PROPERTY(mode, get_mode); + MAKE_PROPERTY(mode_type, get_mode_type); + MAKE_PROPERTY(mode_quality, get_mode_quality); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/audioVolumeAttrib.h b/panda/src/pgraph/audioVolumeAttrib.h index 29ccf23563..3b2120462f 100644 --- a/panda/src/pgraph/audioVolumeAttrib.h +++ b/panda/src/pgraph/audioVolumeAttrib.h @@ -40,6 +40,9 @@ PUBLISHED: INLINE PN_stdfloat get_volume() const; CPT(RenderAttrib) set_volume(PN_stdfloat volume) const; +PUBLISHED: + MAKE_PROPERTY2(volume, has_volume, get_volume); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/auxBitplaneAttrib.h b/panda/src/pgraph/auxBitplaneAttrib.h index 75ac6aee01..4c5866c49c 100644 --- a/panda/src/pgraph/auxBitplaneAttrib.h +++ b/panda/src/pgraph/auxBitplaneAttrib.h @@ -63,6 +63,9 @@ PUBLISHED: INLINE int get_outputs() const; +PUBLISHED: + MAKE_PROPERTY(outputs, get_outputs); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/colorAttrib.h b/panda/src/pgraph/colorAttrib.h index e2f38f46ed..54b57b8abb 100644 --- a/panda/src/pgraph/colorAttrib.h +++ b/panda/src/pgraph/colorAttrib.h @@ -42,6 +42,10 @@ PUBLISHED: INLINE Type get_color_type() const; INLINE const LColor &get_color() const; +PUBLISHED: + MAKE_PROPERTY(color_type, get_color_type); + MAKE_PROPERTY(color, get_color); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/colorBlendAttrib.cxx b/panda/src/pgraph/colorBlendAttrib.cxx index ce996ed81d..92fe98ab79 100644 --- a/panda/src/pgraph/colorBlendAttrib.cxx +++ b/panda/src/pgraph/colorBlendAttrib.cxx @@ -175,6 +175,13 @@ write_datagram(BamWriter *manager, Datagram &dg) { dg.add_uint8(_mode); dg.add_uint8(_a); dg.add_uint8(_b); + + if (manager->get_file_minor_ver() >= 42) { + dg.add_uint8(_alpha_mode); + dg.add_uint8(_alpha_a); + dg.add_uint8(_alpha_b); + } + _color.write_datagram(dg); } diff --git a/panda/src/pgraph/colorBlendAttrib.h b/panda/src/pgraph/colorBlendAttrib.h index fdaefcc942..6d66747218 100644 --- a/panda/src/pgraph/colorBlendAttrib.h +++ b/panda/src/pgraph/colorBlendAttrib.h @@ -104,6 +104,17 @@ PUBLISHED: INLINE static bool involves_constant_color(Operand operand); INLINE static bool involves_color_scale(Operand operand); +PUBLISHED: + MAKE_PROPERTY(rgb_mode, get_mode); + MAKE_PROPERTY(rgb_operand_a, get_operand_a); + MAKE_PROPERTY(rgb_operand_b, get_operand_b); + + MAKE_PROPERTY(alpha_mode, get_alpha_mode); + MAKE_PROPERTY(alpha_operand_a, get_alpha_operand_a); + MAKE_PROPERTY(alpha_operand_b, get_alpha_operand_b); + + MAKE_PROPERTY(color, get_color); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/colorScaleAttrib.h b/panda/src/pgraph/colorScaleAttrib.h index 060b2721a1..aa3ace8738 100644 --- a/panda/src/pgraph/colorScaleAttrib.h +++ b/panda/src/pgraph/colorScaleAttrib.h @@ -43,6 +43,9 @@ PUBLISHED: INLINE const LVecBase4 &get_scale() const; CPT(RenderAttrib) set_scale(const LVecBase4 &scale) const; +PUBLISHED: + MAKE_PROPERTY2(scale, has_scale, get_scale); + public: virtual bool lower_attrib_can_override() const; virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/colorWriteAttrib.h b/panda/src/pgraph/colorWriteAttrib.h index 76d9d5c1db..b7dcb7eb37 100644 --- a/panda/src/pgraph/colorWriteAttrib.h +++ b/panda/src/pgraph/colorWriteAttrib.h @@ -48,6 +48,9 @@ PUBLISHED: INLINE unsigned int get_channels() const; +PUBLISHED: + MAKE_PROPERTY(channels, get_channels); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/cullBinAttrib.h b/panda/src/pgraph/cullBinAttrib.h index c61fd2ebfc..f17a9876c6 100644 --- a/panda/src/pgraph/cullBinAttrib.h +++ b/panda/src/pgraph/cullBinAttrib.h @@ -35,6 +35,10 @@ PUBLISHED: INLINE const string &get_bin_name() const; INLINE int get_draw_order() const; +PUBLISHED: + MAKE_PROPERTY(bin_name, get_bin_name); + MAKE_PROPERTY(draw_order, get_draw_order); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/cullFaceAttrib.h b/panda/src/pgraph/cullFaceAttrib.h index 1dc2d8147e..5f6589a52a 100644 --- a/panda/src/pgraph/cullFaceAttrib.h +++ b/panda/src/pgraph/cullFaceAttrib.h @@ -44,6 +44,11 @@ PUBLISHED: INLINE bool get_reverse() const; Mode get_effective_mode() const; +PUBLISHED: + MAKE_PROPERTY(mode, get_actual_mode); + MAKE_PROPERTY(reverse, get_reverse); + MAKE_PROPERTY(effective_mode, get_effective_mode); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/depthOffsetAttrib.h b/panda/src/pgraph/depthOffsetAttrib.h index fe617fa56a..0976e2025a 100644 --- a/panda/src/pgraph/depthOffsetAttrib.h +++ b/panda/src/pgraph/depthOffsetAttrib.h @@ -60,6 +60,11 @@ PUBLISHED: INLINE PN_stdfloat get_min_value() const; INLINE PN_stdfloat get_max_value() const; +PUBLISHED: + MAKE_PROPERTY(offset, get_offset); + MAKE_PROPERTY(min_value, get_min_value); + MAKE_PROPERTY(max_value, get_max_value); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/depthTestAttrib.h b/panda/src/pgraph/depthTestAttrib.h index 66eb9fb135..6380a197d9 100644 --- a/panda/src/pgraph/depthTestAttrib.h +++ b/panda/src/pgraph/depthTestAttrib.h @@ -33,6 +33,9 @@ PUBLISHED: INLINE PandaCompareFunc get_mode() const; +PUBLISHED: + MAKE_PROPERTY(mode, get_mode); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/depthWriteAttrib.h b/panda/src/pgraph/depthWriteAttrib.h index 7efdf4a70f..9cd96b40f9 100644 --- a/panda/src/pgraph/depthWriteAttrib.h +++ b/panda/src/pgraph/depthWriteAttrib.h @@ -39,6 +39,9 @@ PUBLISHED: INLINE Mode get_mode() const; +PUBLISHED: + MAKE_PROPERTY(mode, get_mode); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/fogAttrib.h b/panda/src/pgraph/fogAttrib.h index 1762fb09ee..28a84600e0 100644 --- a/panda/src/pgraph/fogAttrib.h +++ b/panda/src/pgraph/fogAttrib.h @@ -34,6 +34,9 @@ PUBLISHED: INLINE bool is_off() const; INLINE Fog *get_fog() const; +PUBLISHED: + MAKE_PROPERTY(fog, get_fog); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/lightRampAttrib.h b/panda/src/pgraph/lightRampAttrib.h index 08c3a1ea84..b1ac147376 100644 --- a/panda/src/pgraph/lightRampAttrib.h +++ b/panda/src/pgraph/lightRampAttrib.h @@ -52,6 +52,9 @@ PUBLISHED: INLINE PN_stdfloat get_level(int n) const; INLINE PN_stdfloat get_threshold(int n) const; +PUBLISHED: + MAKE_PROPERTY(mode, get_mode); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/materialAttrib.h b/panda/src/pgraph/materialAttrib.h index 729e9ac345..f984b699b3 100644 --- a/panda/src/pgraph/materialAttrib.h +++ b/panda/src/pgraph/materialAttrib.h @@ -36,6 +36,9 @@ PUBLISHED: INLINE bool is_off() const; INLINE Material *get_material() const; +PUBLISHED: + MAKE_PROPERTY(material, get_material); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/renderModeAttrib.h b/panda/src/pgraph/renderModeAttrib.h index 0306de9737..631789dd60 100644 --- a/panda/src/pgraph/renderModeAttrib.h +++ b/panda/src/pgraph/renderModeAttrib.h @@ -63,9 +63,14 @@ PUBLISHED: INLINE PN_stdfloat get_thickness() const; INLINE bool get_perspective() const; INLINE const LColor &get_wireframe_color() const; - INLINE int get_geom_rendering(int geom_rendering) const; +PUBLISHED: + MAKE_PROPERTY(mode, get_mode); + MAKE_PROPERTY(thickness, get_thickness); + MAKE_PROPERTY(perspective, get_perspective); + MAKE_PROPERTY(wireframe_color, get_wireframe_color); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/rescaleNormalAttrib.h b/panda/src/pgraph/rescaleNormalAttrib.h index 3017c9a879..d76d51e6de 100644 --- a/panda/src/pgraph/rescaleNormalAttrib.h +++ b/panda/src/pgraph/rescaleNormalAttrib.h @@ -49,6 +49,7 @@ PUBLISHED: INLINE static CPT(RenderAttrib) make_default(); INLINE Mode get_mode() const; + MAKE_PROPERTY(mode, get_mode); public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/scissorAttrib.h b/panda/src/pgraph/scissorAttrib.h index 941d704a7c..48a4b87a7c 100644 --- a/panda/src/pgraph/scissorAttrib.h +++ b/panda/src/pgraph/scissorAttrib.h @@ -47,6 +47,9 @@ PUBLISHED: INLINE const LVecBase4 &get_frame() const; +PUBLISHED: + MAKE_PROPERTY(frame, get_frame); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/shadeModelAttrib.h b/panda/src/pgraph/shadeModelAttrib.h index c9550bccac..067555207a 100644 --- a/panda/src/pgraph/shadeModelAttrib.h +++ b/panda/src/pgraph/shadeModelAttrib.h @@ -39,6 +39,7 @@ PUBLISHED: static CPT(RenderAttrib) make_default(); INLINE Mode get_mode() const; + MAKE_PROPERTY(mode, get_mode); public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/shaderAttrib.h b/panda/src/pgraph/shaderAttrib.h index 9159d52e18..08676286f5 100644 --- a/panda/src/pgraph/shaderAttrib.h +++ b/panda/src/pgraph/shaderAttrib.h @@ -114,6 +114,10 @@ PUBLISHED: static void register_with_read_factory(); +PUBLISHED: + MAKE_PROPERTY(shader, get_shader); + MAKE_PROPERTY(instance_count, get_instance_count); + public: virtual void output(ostream &out) const; diff --git a/panda/src/pgraph/transparencyAttrib.h b/panda/src/pgraph/transparencyAttrib.h index 2baf3710a1..ebd7f4f157 100644 --- a/panda/src/pgraph/transparencyAttrib.h +++ b/panda/src/pgraph/transparencyAttrib.h @@ -51,6 +51,7 @@ PUBLISHED: static CPT(RenderAttrib) make_default(); INLINE Mode get_mode() const; + MAKE_PROPERTY(mode, get_mode); public: virtual void output(ostream &out) const;