diff --git a/bazaar/SurfaceCtrl/Object3D.cpp b/bazaar/SurfaceCtrl/Object3D.cpp index 32bef9174..ef9dba814 100644 --- a/bazaar/SurfaceCtrl/Object3D.cpp +++ b/bazaar/SurfaceCtrl/Object3D.cpp @@ -610,12 +610,9 @@ void Object3D::Draw(glm::mat4 projectionMatrix, glm::mat4 viewMatrix,glm::vec3 v material.HaveBeenUpdated(); } } - - prog.SetMat4("ViewMatrix", viewMatrix); prog.SetMat4("ProjectionMatrix", projectionMatrix); prog.SetMat4("ModelMatrix", transform.GetModelMatrix()); - for(Mesh& m : meshes){ glBindVertexArray(m.GetVAO()); if(textures.GetCount()> 0){ diff --git a/bazaar/SurfaceCtrl/SurfaceCtrl.h b/bazaar/SurfaceCtrl/SurfaceCtrl.h index 2994fc9f2..9b9e7ad3e 100644 --- a/bazaar/SurfaceCtrl/SurfaceCtrl.h +++ b/bazaar/SurfaceCtrl/SurfaceCtrl.h @@ -63,7 +63,7 @@ class SurfaceCtrl : public GL{ void DrawAllObjects()noexcept; //Draw all object //Change selected object vector - const Upp::Vector& GetSelectedObject()const noexcept; //return const vector representing all selected Object + const Upp::Vector& GetSelectedObject()const noexcept{return allSelected;} //return const vector representing all selected Object void AddSelectedObject(int ID)noexcept; void UpdateSelectedObjectViaMouse(Point& p, dword keyflags)noexcept; //Process work on selected object depending on keyflags and point glm::vec3 GetCenterPoint()const noexcept; //Return center point between all selected item