RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ColorBlendAttrib bam write, add properties to most *Attrib

This commit is contained in:
rdb 2016-04-09 19:10:52 +02:00
parent f0cd1ce315
commit 64cb1c520e
23 changed files with 88 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/pgraph/alphaTestAttrib.h
View File

@ -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;

5
panda/src/pgraph/antialiasAttrib.h
View File

@ -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;

3
panda/src/pgraph/audioVolumeAttrib.h
View File

@ -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;

3
panda/src/pgraph/auxBitplaneAttrib.h
View File

@ -63,6 +63,9 @@ PUBLISHED:
INLINE int get_outputs() const;
PUBLISHED:
MAKE_PROPERTY(outputs, get_outputs);
public:
virtual void output(ostream &out) const;

4
panda/src/pgraph/colorAttrib.h
View File

@ -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;

7
panda/src/pgraph/colorBlendAttrib.cxx
View File

@ -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);
}

11
panda/src/pgraph/colorBlendAttrib.h
View File

@ -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;

3
panda/src/pgraph/colorScaleAttrib.h
View File

@ -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;

3
panda/src/pgraph/colorWriteAttrib.h
View File

@ -48,6 +48,9 @@ PUBLISHED:
INLINE unsigned int get_channels() const;
PUBLISHED:
MAKE_PROPERTY(channels, get_channels);
public:
virtual void output(ostream &out) const;

4
panda/src/pgraph/cullBinAttrib.h
View File

@ -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;

5
panda/src/pgraph/cullFaceAttrib.h
View File

@ -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;

5
panda/src/pgraph/depthOffsetAttrib.h
View File

@ -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;

3
panda/src/pgraph/depthTestAttrib.h
View File

@ -33,6 +33,9 @@ PUBLISHED:
INLINE PandaCompareFunc get_mode() const;
PUBLISHED:
MAKE_PROPERTY(mode, get_mode);
public:
virtual void output(ostream &out) const;

3
panda/src/pgraph/depthWriteAttrib.h
View File

@ -39,6 +39,9 @@ PUBLISHED:
INLINE Mode get_mode() const;
PUBLISHED:
MAKE_PROPERTY(mode, get_mode);
public:
virtual void output(ostream &out) const;

3
panda/src/pgraph/fogAttrib.h
View File

@ -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;

3
panda/src/pgraph/lightRampAttrib.h
View File

@ -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;

3
panda/src/pgraph/materialAttrib.h
View File

@ -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;

7
panda/src/pgraph/renderModeAttrib.h
View File

@ -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;

1
panda/src/pgraph/rescaleNormalAttrib.h
View File

@ -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;

3
panda/src/pgraph/scissorAttrib.h
View File

@ -47,6 +47,9 @@ PUBLISHED:
INLINE const LVecBase4 &get_frame() const;
PUBLISHED:
MAKE_PROPERTY(frame, get_frame);
public:
virtual void output(ostream &out) const;

1
panda/src/pgraph/shadeModelAttrib.h
View File

@ -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;

4
panda/src/pgraph/shaderAttrib.h
View File

@ -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;

1
panda/src/pgraph/transparencyAttrib.h
View File

@ -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;