Reimplemented image components
This commit is contained in:
parent
9187518290
commit
859924663b
8 changed files with 180 additions and 15 deletions
|
|
@ -18,6 +18,7 @@ class CanvasComponent {
|
|||
virtual void load(cereal::PortableBinaryInputArchive& a) = 0;
|
||||
virtual void save_file(cereal::PortableBinaryOutputArchive& a) const = 0;
|
||||
virtual void load_file(cereal::PortableBinaryInputArchive& a, VersionNumber version) = 0;
|
||||
virtual void update(DrawingProgram& drawP);
|
||||
|
||||
virtual void set_data_from(const CanvasComponent& other) = 0;
|
||||
protected:
|
||||
|
|
@ -26,7 +27,6 @@ class CanvasComponent {
|
|||
|
||||
virtual void draw(SkCanvas* canvas, const DrawData& drawData) const = 0;
|
||||
virtual void initialize_draw_data(DrawingProgram& drawP) = 0;
|
||||
virtual void update(DrawingProgram& drawP);
|
||||
virtual bool collides_within_coords(const SCollision::ColliderCollection<float>& checkAgainst) const = 0;
|
||||
|
||||
virtual SCollision::AABB<float> get_obj_coord_bounds() const = 0;
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ void ImageCanvasComponent::draw(SkCanvas* canvas, const DrawData& drawData) cons
|
|||
void ImageCanvasComponent::update(DrawingProgram& drawP) {
|
||||
ResourceDisplay* display = drawP.world.drawData.rMan->get_display_data(d.imageID);
|
||||
if(display) {
|
||||
//if(display->update_draw())
|
||||
// drawP.invalidate_cache_at_component(compContainer->objInfo);
|
||||
if(display->update_draw())
|
||||
drawP.invalidate_cache_at_component(compContainer->objInfo.lock());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,10 +23,11 @@ class ImageCanvasComponent : public CanvasComponent {
|
|||
NetworkingObjects::NetObjID imageID;
|
||||
} d;
|
||||
|
||||
virtual void update(DrawingProgram& drawP) override;
|
||||
|
||||
private:
|
||||
virtual void draw(SkCanvas* canvas, const DrawData& drawData) const override;
|
||||
virtual void initialize_draw_data(DrawingProgram& drawP) override;
|
||||
virtual void update(DrawingProgram& drawP) override;
|
||||
virtual bool collides_within_coords(const SCollision::ColliderCollection<float>& checkAgainst) const override;
|
||||
void create_draw_data();
|
||||
void create_collider();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue