mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-05-29 11:31:42 +02:00
COmmenting the remove of the glLIneWidth and demoving dead code
This commit is contained in:
parent
d07ab353fc
commit
34183b9ddf
6 changed files with 8 additions and 4 deletions
|
@ -397,6 +397,7 @@ void Head::renderLookatVectors(RenderArgs* renderArgs, glm::vec3 leftEyePosition
|
||||||
auto& batch = *renderArgs->_batch;
|
auto& batch = *renderArgs->_batch;
|
||||||
auto transform = Transform{};
|
auto transform = Transform{};
|
||||||
batch.setModelTransform(transform);
|
batch.setModelTransform(transform);
|
||||||
|
// FIXME: THe line width of 2.0f is not supported anymore, we ll need a workaround
|
||||||
|
|
||||||
auto deferredLighting = DependencyManager::get<DeferredLightingEffect>();
|
auto deferredLighting = DependencyManager::get<DeferredLightingEffect>();
|
||||||
deferredLighting->bindSimpleProgram(batch);
|
deferredLighting->bindSimpleProgram(batch);
|
||||||
|
|
|
@ -248,6 +248,7 @@ void SkeletonModel::renderJointConstraints(gpu::Batch& batch, int jointIndex) {
|
||||||
const FBXGeometry& geometry = _geometry->getFBXGeometry();
|
const FBXGeometry& geometry = _geometry->getFBXGeometry();
|
||||||
const float BASE_DIRECTION_SIZE = 0.3f;
|
const float BASE_DIRECTION_SIZE = 0.3f;
|
||||||
float directionSize = BASE_DIRECTION_SIZE * extractUniformScale(_scale);
|
float directionSize = BASE_DIRECTION_SIZE * extractUniformScale(_scale);
|
||||||
|
// FIXME: THe line width of 3.0f is not supported anymore, we ll need a workaround
|
||||||
|
|
||||||
do {
|
do {
|
||||||
const FBXJoint& joint = geometry.joints.at(jointIndex);
|
const FBXJoint& joint = geometry.joints.at(jointIndex);
|
||||||
|
|
|
@ -245,6 +245,7 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder(RenderArgs* renderAr
|
||||||
batch.setModelTransform(Transform());
|
batch.setModelTransform(Transform());
|
||||||
batch.setViewTransform(Transform());
|
batch.setViewTransform(Transform());
|
||||||
batch.setResourceTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());
|
batch.setResourceTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());
|
||||||
|
// FIXME: THe line width of CONNECTION_STATUS_BORDER_LINE_WIDTH is not supported anymore, we ll need a workaround
|
||||||
|
|
||||||
// TODO animate the disconnect border for some excitement while not connected?
|
// TODO animate the disconnect border for some excitement while not connected?
|
||||||
//double usecs = usecTimestampNow();
|
//double usecs = usecTimestampNow();
|
||||||
|
|
|
@ -101,7 +101,9 @@ void Circle3DOverlay::render(RenderArgs* args) {
|
||||||
|
|
||||||
Q_ASSERT(args->_batch);
|
Q_ASSERT(args->_batch);
|
||||||
auto& batch = *args->_batch;
|
auto& batch = *args->_batch;
|
||||||
|
|
||||||
|
// FIXME: THe line width of _lineWidth is not supported anymore, we ll need a workaround
|
||||||
|
|
||||||
auto transform = _transform;
|
auto transform = _transform;
|
||||||
transform.postScale(glm::vec3(getDimensions(), 1.0f));
|
transform.postScale(glm::vec3(getDimensions(), 1.0f));
|
||||||
batch.setModelTransform(transform);
|
batch.setModelTransform(transform);
|
||||||
|
|
|
@ -84,6 +84,8 @@ void Grid3DOverlay::render(RenderArgs* args) {
|
||||||
transform.setTranslation(position);
|
transform.setTranslation(position);
|
||||||
transform.setScale(scale);
|
transform.setScale(scale);
|
||||||
|
|
||||||
|
// FIXME: THe line width of 4.0f is not supported anymore, we ll need a workaround
|
||||||
|
|
||||||
batch->setModelTransform(transform);
|
batch->setModelTransform(transform);
|
||||||
|
|
||||||
DependencyManager::get<GeometryCache>()->renderGrid(*batch, MAJOR_GRID_DIVISIONS, MAJOR_GRID_DIVISIONS, gridColor);
|
DependencyManager::get<GeometryCache>()->renderGrid(*batch, MAJOR_GRID_DIVISIONS, MAJOR_GRID_DIVISIONS, gridColor);
|
||||||
|
|
|
@ -586,12 +586,9 @@ void GLBackend::do_setStateMultisampleEnable(bool enable) {
|
||||||
|
|
||||||
void GLBackend::do_setStateAntialiasedLineEnable(bool enable) {
|
void GLBackend::do_setStateAntialiasedLineEnable(bool enable) {
|
||||||
if (_pipeline._stateCache.antialisedLineEnable != enable) {
|
if (_pipeline._stateCache.antialisedLineEnable != enable) {
|
||||||
// FIXME CORE
|
|
||||||
if (enable) {
|
if (enable) {
|
||||||
// glEnable(GL_POINT_SMOOTH);
|
|
||||||
glEnable(GL_LINE_SMOOTH);
|
glEnable(GL_LINE_SMOOTH);
|
||||||
} else {
|
} else {
|
||||||
// glDisable(GL_POINT_SMOOTH);
|
|
||||||
glDisable(GL_LINE_SMOOTH);
|
glDisable(GL_LINE_SMOOTH);
|
||||||
}
|
}
|
||||||
(void) CHECK_GL_ERROR();
|
(void) CHECK_GL_ERROR();
|
||||||
|
|
Loading…
Reference in a new issue