small refactoring

globject.h

@@ -27,12 +27,8 @@
 
 class ObjectBase
 {
-	friend class QGLView;
 	friend class Scene;
-	friend class Renderer;
-	friend class RendererService;
 	friend class RendererSelection;
-	friend class MouseController;
 	friend QDataStream & operator <<(QDataStream & s, const ObjectBase * p);
 	friend QDataStream & operator >>(QDataStream & s, ObjectBase *& p);
 	friend QDataStream & operator >>(QDataStream & s, Scene *& p);
@@ -53,6 +49,7 @@ public:
 	bool isInit() const {return is_init;}
 	Type type() const {return type_;}
 	RenderPass pass() const;
+	uint id() const {return id_;}
 
 	RenderMode renderMode() const {return render_mode;}
 	void setRenderMode(RenderMode mode) {render_mode = mode;}
@@ -161,12 +158,11 @@ public:
 	void select() {setSelected(true);}
 	void deselect() {setSelected(false);}
 	ObjectBase * selectedParent() const;
+	void setAimSelected(bool yes) {selected_aim = yes;}
+	bool isAimSelected() const {return selected_aim;}
 
 	bool isSelectable() const {return select_;}
 	void setSelectable(bool yes) {select_ = yes;}
-	/*
-	bool isWriteDepth() const {return write_depth_;}
-	void setWriteDepth(bool yes) {write_depth_ = yes;}*/
 
 	GLenum srcAlpha() const {return blend_src;}
 	GLenum destAlpha() const {return blend_dest;}
@@ -193,8 +189,6 @@ public:
 
 	QVector3D pos_h;
 
-	//QVector<GLfloat> d_vertices, d_normals, d_uvs;
-
 protected:
 	virtual void transformChanged() {}
 	void addChildren(ObjectBaseList & list, ObjectBase * where);
@@ -224,7 +218,6 @@ protected:
 	Material * material_;
 	Mesh * mesh_;
 	QVariantMap meta;
-
 };
 
 inline bool operator <(const ObjectBase & f, const ObjectBase & s) {return f.pos_h.z() < s.pos_h.z();}
@@ -292,9 +285,6 @@ public:
 	Type light_type;
 	Framebuffer shadow_map;
 	QMatrix4x4 shadow_matrix;
-
-protected:
-
 };
 
 template <class T>