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

This commit is contained in:
2019-12-03 10:55:21 +00:00
parent 844173d571
commit c38678056d
7 changed files with 14 additions and 12 deletions

View File

@@ -190,9 +190,8 @@ void RendererService::fillSpotObjects() {
cur_objects.clear();
cur_aims.clear();
foreach (Light * l, ll) {
QMatrix4x4 m, lm;
lm = l->transform().matrixRotate();
m = invariantSizeMatrix(l->worldPos()) * parentRotationMatrix(l) * lm;
QMatrix4x4 m;
m = invariantSizeMatrix(l->worldPos()) * parentRotationMatrix(l);
m.transposed().copyDataTo(o.modelmatrix);
o.object_id = l->id_;
cur_objects << o;
@@ -387,6 +386,7 @@ void RendererService::renderService() {
f->glViewport(0, 0, axis_viewport.width(), axis_viewport.height());
axis_camera->setPos(-r->view->camera()->direction() * 3.);
axis_camera->setAim(QVector3D());
axis_camera->setRotation(r->view->camera()->rotation());
r->setUniformCamera(prog, axis_camera, true, axis_viewport);
axis_mesh->draw(f, 3);
f->glViewport(0, 0, r->view->width(), r->view->height());