History

Fixing lighting and atmosphere

Bradley Austin Davis committed 11 years ago

Commit e12e4ec1 parent e024d236 files · +12 −11Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 6 files). Show all

Unified · Split

interface/src/avatar/SkeletonModel.cpp+2−2
@@ -643,7 +643,7 @@ void SkeletonModel::renderBoundingCollisionShapes(gpu::Batch& batch, float alpha · 642 unmodified lines
643 glm::vec3 topPoint = _translation + _boundingCapsuleLocalOffset + (0.5f * _boundingCapsuleHeight) * glm::vec3(0.0f, 1.0f, 0.0f);643 glm::vec3 topPoint = _translation + _boundingCapsuleLocalOffset + (0.5f * _boundingCapsuleHeight) * glm::vec3(0.0f, 1.0f, 0.0f);
644 644
645 deferredLighting->renderSolidSphereInstance(batch, 645 deferredLighting->renderSolidSphereInstance(batch,
646 Transform().setTranslation(topPoint).postScale(_boundingCapsuleRadius * 2.0),646 Transform().setTranslation(topPoint).postScale(_boundingCapsuleRadius),
647 glm::vec4(0.6f, 0.6f, 0.8f, alpha));647 glm::vec4(0.6f, 0.6f, 0.8f, alpha));
648 648
649 // draw a yellow sphere at the capsule bottom point649 // draw a yellow sphere at the capsule bottom point
@@ -651,7 +651,7 @@ void SkeletonModel::renderBoundingCollisionShapes(gpu::Batch& batch, float alpha · 1 unmodified line
651 glm::vec3 axis = topPoint - bottomPoint;651 glm::vec3 axis = topPoint - bottomPoint;
652 652
653 deferredLighting->renderSolidSphereInstance(batch, 653 deferredLighting->renderSolidSphereInstance(batch,
654 Transform().setTranslation(bottomPoint).postScale(_boundingCapsuleRadius * 2.0),654 Transform().setTranslation(bottomPoint).postScale(_boundingCapsuleRadius),
655 glm::vec4(0.8f, 0.8f, 0.6f, alpha));655 glm::vec4(0.8f, 0.8f, 0.6f, alpha));
656 656
657 // draw a green cylinder between the two points657 // draw a green cylinder between the two points

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t