History

Merge branch 'master' of https://github.com/worklist/hifi into lod_slider

ZappoMan committed 13 years ago

Commit 3a6f8ea2 parents dd7eb66 0ea60c110 files · +60 −82Browse files

Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all

Unified · Split

interface/src/Application.cpp+0−26
@@ -2744,32 +2744,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 2743 unmodified lines
27442744 // disable specular lighting for ground and voxels
27452745 glMaterialfv(GL_FRONT, GL_SPECULAR, NO_SPECULAR_COLOR);
27462746
2747− //draw a grid ground plane....
2748− if (Menu::getInstance()->isOptionChecked(MenuOption::GroundPlane)) {
2749− PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2750− "Application::displaySide() ... ground plane...");
2751−
2752− // draw grass plane with fog
2753− glEnable(GL_FOG);
2754− glEnable(GL_NORMALIZE);
2755− const float FOG_COLOR[] = { 1.0f, 1.0f, 1.0f, 1.0f };
2756− glFogfv(GL_FOG_COLOR, FOG_COLOR);
2757− glFogi(GL_FOG_MODE, GL_EXP2);
2758− glFogf(GL_FOG_DENSITY, 0.025f);
2759− glPushMatrix();
2760− const float GRASS_PLANE_SIZE = 256.0f;
2761− glTranslatef(-GRASS_PLANE_SIZE * 0.5f, -0.01f, GRASS_PLANE_SIZE * 0.5f);
2762− glScalef(GRASS_PLANE_SIZE, 1.0f, GRASS_PLANE_SIZE);
2763− glRotatef(-90.0f, 1.0f, 0.0f, 0.0f);
2764− glColor3ub(70, 134, 74);
2765− const int GRASS_DIVISIONS = 40;
2766− _geometryCache.renderSquare(GRASS_DIVISIONS, GRASS_DIVISIONS);
2767− glPopMatrix();
2768− glDisable(GL_FOG);
2769− glDisable(GL_NORMALIZE);
2770−
2771− //renderGroundPlaneGrid(EDGE_SIZE_GROUND_PLANE, _audio.getCollisionSoundMagnitude());
2772− }
27732747 // Draw Cloud Particles
27742748 if (Menu::getInstance()->isOptionChecked(MenuOption::ParticleCloud)) {
27752749 _cloud.render();

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