mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-28 07:48:37 -04:00
gobj: Delete assignment operator of Geom* classes
They are unused and it would probably be a bad idea to try to use them.
This commit is contained in:
parent
6b9dea3e30
commit
72f98ec30d
@ -62,26 +62,6 @@ Geom(const Geom ©) :
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The copy assignment operator is not pipeline-safe. This will completely
|
|
||||||
* obliterate all stages of the pipeline, so don't do it for a Geom that is
|
|
||||||
* actively being used for rendering.
|
|
||||||
*/
|
|
||||||
void Geom::
|
|
||||||
operator = (const Geom ©) {
|
|
||||||
CopyOnWriteObject::operator = (copy);
|
|
||||||
|
|
||||||
clear_cache();
|
|
||||||
|
|
||||||
_cycler = copy._cycler;
|
|
||||||
|
|
||||||
OPEN_ITERATE_ALL_STAGES(_cycler) {
|
|
||||||
CDStageWriter cdata(_cycler, pipeline_stage);
|
|
||||||
mark_internal_bounds_stale(cdata);
|
|
||||||
}
|
|
||||||
CLOSE_ITERATE_ALL_STAGES(_cycler);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -62,10 +62,11 @@ protected:
|
|||||||
Geom(const Geom ©);
|
Geom(const Geom ©);
|
||||||
|
|
||||||
PUBLISHED:
|
PUBLISHED:
|
||||||
void operator = (const Geom ©);
|
|
||||||
virtual ~Geom();
|
virtual ~Geom();
|
||||||
ALLOC_DELETED_CHAIN(Geom);
|
ALLOC_DELETED_CHAIN(Geom);
|
||||||
|
|
||||||
|
void operator = (const Geom ©) = delete;
|
||||||
|
|
||||||
virtual Geom *make_copy() const;
|
virtual Geom *make_copy() const;
|
||||||
|
|
||||||
INLINE PrimitiveType get_primitive_type() const;
|
INLINE PrimitiveType get_primitive_type() const;
|
||||||
|
@ -77,17 +77,6 @@ GeomPrimitive(const GeomPrimitive ©) :
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The copy assignment operator is not pipeline-safe. This will completely
|
|
||||||
* obliterate all stages of the pipeline, so don't do it for a GeomPrimitive
|
|
||||||
* that is actively being used for rendering.
|
|
||||||
*/
|
|
||||||
void GeomPrimitive::
|
|
||||||
operator = (const GeomPrimitive ©) {
|
|
||||||
CopyOnWriteObject::operator = (copy);
|
|
||||||
_cycler = copy._cycler;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -61,10 +61,11 @@ protected:
|
|||||||
PUBLISHED:
|
PUBLISHED:
|
||||||
explicit GeomPrimitive(UsageHint usage_hint);
|
explicit GeomPrimitive(UsageHint usage_hint);
|
||||||
GeomPrimitive(const GeomPrimitive ©);
|
GeomPrimitive(const GeomPrimitive ©);
|
||||||
void operator = (const GeomPrimitive ©);
|
|
||||||
virtual ~GeomPrimitive();
|
virtual ~GeomPrimitive();
|
||||||
ALLOC_DELETED_CHAIN(GeomPrimitive);
|
ALLOC_DELETED_CHAIN(GeomPrimitive);
|
||||||
|
|
||||||
|
void operator = (const GeomPrimitive ©) = delete;
|
||||||
|
|
||||||
virtual PT(GeomPrimitive) make_copy() const=0;
|
virtual PT(GeomPrimitive) make_copy() const=0;
|
||||||
|
|
||||||
virtual PrimitiveType get_primitive_type() const=0;
|
virtual PrimitiveType get_primitive_type() const=0;
|
||||||
|
@ -107,30 +107,6 @@ GeomVertexArrayData(const GeomVertexArrayData ©) :
|
|||||||
nassertv(_array_format->is_registered());
|
nassertv(_array_format->is_registered());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The copy assignment operator is not pipeline-safe. This will completely
|
|
||||||
* obliterate all stages of the pipeline, so don't do it for a
|
|
||||||
* GeomVertexArrayData that is actively being used for rendering.
|
|
||||||
*/
|
|
||||||
void GeomVertexArrayData::
|
|
||||||
operator = (const GeomVertexArrayData ©) {
|
|
||||||
CopyOnWriteObject::operator = (copy);
|
|
||||||
SimpleLruPage::operator = (copy);
|
|
||||||
|
|
||||||
copy.mark_used_lru();
|
|
||||||
|
|
||||||
_array_format = copy._array_format;
|
|
||||||
_cycler = copy._cycler;
|
|
||||||
|
|
||||||
OPEN_ITERATE_ALL_STAGES(_cycler) {
|
|
||||||
CDStageWriter cdata(_cycler, pipeline_stage);
|
|
||||||
cdata->_modified = Geom::get_next_modified();
|
|
||||||
}
|
|
||||||
CLOSE_ITERATE_ALL_STAGES(_cycler);
|
|
||||||
|
|
||||||
nassertv(_array_format->is_registered());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -66,10 +66,11 @@ PUBLISHED:
|
|||||||
explicit GeomVertexArrayData(const GeomVertexArrayFormat *array_format,
|
explicit GeomVertexArrayData(const GeomVertexArrayFormat *array_format,
|
||||||
UsageHint usage_hint);
|
UsageHint usage_hint);
|
||||||
GeomVertexArrayData(const GeomVertexArrayData ©);
|
GeomVertexArrayData(const GeomVertexArrayData ©);
|
||||||
void operator = (const GeomVertexArrayData ©);
|
|
||||||
virtual ~GeomVertexArrayData();
|
virtual ~GeomVertexArrayData();
|
||||||
ALLOC_DELETED_CHAIN(GeomVertexArrayData);
|
ALLOC_DELETED_CHAIN(GeomVertexArrayData);
|
||||||
|
|
||||||
|
void operator = (const GeomVertexArrayData ©) = delete;
|
||||||
|
|
||||||
int compare_to(const GeomVertexArrayData &other) const;
|
int compare_to(const GeomVertexArrayData &other) const;
|
||||||
|
|
||||||
INLINE const GeomVertexArrayFormat *get_array_format() const;
|
INLINE const GeomVertexArrayFormat *get_array_format() const;
|
||||||
|
@ -136,33 +136,6 @@ GeomVertexData(const GeomVertexData ©,
|
|||||||
CLOSE_ITERATE_ALL_STAGES(_cycler);
|
CLOSE_ITERATE_ALL_STAGES(_cycler);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The copy assignment operator is not pipeline-safe. This will completely
|
|
||||||
* obliterate all stages of the pipeline, so don't do it for a GeomVertexData
|
|
||||||
* that is actively being used for rendering.
|
|
||||||
*/
|
|
||||||
void GeomVertexData::
|
|
||||||
operator = (const GeomVertexData ©) {
|
|
||||||
CopyOnWriteObject::operator = (copy);
|
|
||||||
|
|
||||||
clear_cache();
|
|
||||||
|
|
||||||
_name = copy._name;
|
|
||||||
_cycler = copy._cycler;
|
|
||||||
_char_pcollector = copy._char_pcollector;
|
|
||||||
_skinning_pcollector = copy._skinning_pcollector;
|
|
||||||
_morphs_pcollector = copy._morphs_pcollector;
|
|
||||||
_blends_pcollector = copy._blends_pcollector;
|
|
||||||
|
|
||||||
OPEN_ITERATE_ALL_STAGES(_cycler) {
|
|
||||||
CDStageWriter cdata(_cycler, pipeline_stage);
|
|
||||||
cdata->_modified = Geom::get_next_modified();
|
|
||||||
cdata->_animated_vertices = nullptr;
|
|
||||||
cdata->_animated_vertices_modified = UpdateSeq();
|
|
||||||
}
|
|
||||||
CLOSE_ITERATE_ALL_STAGES(_cycler);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -78,10 +78,11 @@ PUBLISHED:
|
|||||||
GeomVertexData(const GeomVertexData ©);
|
GeomVertexData(const GeomVertexData ©);
|
||||||
explicit GeomVertexData(const GeomVertexData ©,
|
explicit GeomVertexData(const GeomVertexData ©,
|
||||||
const GeomVertexFormat *format);
|
const GeomVertexFormat *format);
|
||||||
void operator = (const GeomVertexData ©);
|
|
||||||
virtual ~GeomVertexData();
|
virtual ~GeomVertexData();
|
||||||
ALLOC_DELETED_CHAIN(GeomVertexData);
|
ALLOC_DELETED_CHAIN(GeomVertexData);
|
||||||
|
|
||||||
|
void operator = (const GeomVertexData ©) = delete;
|
||||||
|
|
||||||
int compare_to(const GeomVertexData &other) const;
|
int compare_to(const GeomVertexData &other) const;
|
||||||
|
|
||||||
INLINE const std::string &get_name() const;
|
INLINE const std::string &get_name() const;
|
||||||
|
@ -67,15 +67,6 @@ GeomTextGlyph(const Geom ©, const TextGlyph *glyph) :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void GeomTextGlyph::
|
|
||||||
operator = (const GeomTextGlyph ©) {
|
|
||||||
Geom::operator = (copy);
|
|
||||||
_glyphs = copy._glyphs;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -30,10 +30,11 @@ public:
|
|||||||
GeomTextGlyph(const GeomVertexData *data);
|
GeomTextGlyph(const GeomVertexData *data);
|
||||||
GeomTextGlyph(const GeomTextGlyph ©);
|
GeomTextGlyph(const GeomTextGlyph ©);
|
||||||
GeomTextGlyph(const Geom ©, const TextGlyph *glyph);
|
GeomTextGlyph(const Geom ©, const TextGlyph *glyph);
|
||||||
void operator = (const GeomTextGlyph ©);
|
|
||||||
virtual ~GeomTextGlyph();
|
virtual ~GeomTextGlyph();
|
||||||
ALLOC_DELETED_CHAIN(GeomTextGlyph);
|
ALLOC_DELETED_CHAIN(GeomTextGlyph);
|
||||||
|
|
||||||
|
void operator = (const GeomTextGlyph ©) = delete;
|
||||||
|
|
||||||
virtual Geom *make_copy() const;
|
virtual Geom *make_copy() const;
|
||||||
virtual bool copy_primitives_from(const Geom *other);
|
virtual bool copy_primitives_from(const Geom *other);
|
||||||
void count_geom(const Geom *other);
|
void count_geom(const Geom *other);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user