github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-12 22:04:24 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

SurfaceCtrl: added GetSelectedObject function

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14936 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
xemuth 2020-08-30 00:21:01 +00:00
parent 46c0313ec6
commit cf6fc152a3
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
bazaar/SurfaceCtrl/Object3D.cpp
View file

@ -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){

2
bazaar/SurfaceCtrl/SurfaceCtrl.h
View file

@ -63,7 +63,7 @@ class SurfaceCtrl : public GL{
void DrawAllObjects()noexcept; //Draw all object
//Change selected object vector
const Upp::Vector<int>& GetSelectedObject()const noexcept; //return const vector representing all selected Object
const Upp::Vector<int>& 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