expand out SIMPLE_RENDERABLE macro

libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp

@@ -399,6 +399,27 @@ void RenderablePolyVoxEntityItem::getModel() {
     _needsModelReload = false;
 }
 
+bool RenderablePolyVoxEntityItem::addToScene(EntityItemPointer self,
+                                             std::shared_ptr<render::Scene> scene,
+                                             render::PendingChanges& pendingChanges) {
+    _myItem = scene->allocateID();
+
+    auto renderData = RenderableEntityItemProxy::Pointer(new RenderableEntityItemProxy(self));
+    auto renderPayload = render::PayloadPointer(new RenderableEntityItemProxy::Payload(renderData));
+
+    pendingChanges.resetItem(_myItem, renderPayload);
+
+    return true;
+}
+
+void RenderablePolyVoxEntityItem::removeFromScene(EntityItemPointer self,
+                                                  std::shared_ptr<render::Scene> scene,
+                                                  render::PendingChanges& pendingChanges) {
+    pendingChanges.removeItem(_myItem);
+}
+
+
+
 void RenderablePolyVoxEntityItem::render(RenderArgs* args) {
     PerformanceTimer perfTimer("RenderablePolyVoxEntityItem::render");
     assert(getType() == EntityTypes::PolyVox);

libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h

@@ -70,12 +70,20 @@ public:
 
     virtual void setVoxelInVolume(glm::vec3 position, uint8_t toValue);
 
-    SIMPLE_RENDERABLE();
+    virtual bool addToScene(EntityItemPointer self,
+                            std::shared_ptr<render::Scene> scene,
+                            render::PendingChanges& pendingChanges);
+    virtual void removeFromScene(EntityItemPointer self,
+                                 std::shared_ptr<render::Scene> scene,
+                                 render::PendingChanges& pendingChanges);
+
 
 protected:
     virtual void updateVoxelSurfaceStyle(PolyVoxSurfaceStyle voxelSurfaceStyle);
 
 private:
+    render::ItemID _myItem;
+
     // The PolyVoxEntityItem class has _voxelData which contains dimensions and compressed voxel data.  The dimensions
     // may not match _voxelVolumeSize.