SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@665 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-10 10:22:09 +00:00
parent 86f4e0ad78
commit 9d05dbe6da
24 changed files with 186 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
qglengine/glscene.h
View File

@@ -62,7 +62,7 @@ public:
void assignFrom(const Scene * s);
int objectsCount(bool all = false);
QList<ObjectBase * > objects(bool all = false);
ObjectBaseList objects(bool all = false);
ObjectBase * rootObject() {return root_;}
void removeObject(ObjectBase * o, bool inChildren = true);
void removeObject(ObjectBase & o, bool inChildren = true);
@@ -71,11 +71,11 @@ public:
SelectionMode selectionMode() const {return sel_mode_;}
void setSelectionMode(SelectionMode mode) {sel_mode_ = mode;}
void selectObject(ObjectBase * o, bool add_to_selection = false);
void selectObjects(QList<ObjectBase * > ol, bool add_to_selection = false);
void selectObjects(ObjectBaseList ol, bool add_to_selection = false);
void selectObjectsByMesh();
void selectObjectsByMaterial();
void clearSelection();
QList<ObjectBase * > selectedObjects(bool top_only = false) const;
ObjectBaseList selectedObjects(bool top_only = false) const;
ObjectBase * selectedObject() const;
const Box3D & boundingBox() const;
@@ -115,12 +115,12 @@ protected:
QVector<Mesh*> geometries;
QVector<Material*> materials;
QMap<Mesh*, QList<ObjectBase*> > geometries_used;
QMap<int, QMap<Mesh*, ObjectBaseList>> geometries_used; // [pass][mesh] = ObjectBaseList
QMap<int, QList<Light*>> lights_used; // by Light::Type
QVector<Material*> changed_materials;
SelectionMode sel_mode_;
QList<ObjectBase*> selected_, selected_top;
ObjectBaseList selected_, selected_top;
protected slots: