Changeset 11420 for OpenSceneGraph/trunk/examples/osgfpdepth/osgfpdepth.cpp

Timestamp:

05/12/10 13:37:27 (3 years ago)

Author:

robert

Message:

Fixes for building OSG with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF.

Fixed copy and paste error in Camera::getImplicitBufferAttachmentResolveMask().

Files:

• OpenSceneGraph/trunk/examples/osgfpdepth/osgfpdepth.cpp (modified) (10 diffs)

OpenSceneGraph/trunk/examples/osgfpdepth/osgfpdepth.cpp

@@ -405 +405 @@
     textInverted->addDrawable(inverted);
     textInverted->setNodeMask(~0u);
-    textProjection->addChild(textInverted);
+    textProjection->addChild(textInverted.get());
     textProjection->getOrCreateStateSet()->setRenderBinDetails(11, "RenderBin");
 }
@@ -642 +642 @@
 {
     gc->resizedImplementation(x, y, width, height);
-    makeTexturesAndGeometry(width, height, _appState->sw);
+    makeTexturesAndGeometry(width, height, _appState->sw.get());
     _appState->setStateFromConfig(validConfigs[_appState
                                                ->currentConfig]);
@@ -694 +694 @@
     }
 
-    DisplaySettings* ds = viewer.getDisplaySettings();
-    if (!ds)
-        ds = DisplaySettings::instance();
+    DisplaySettings* ds = viewer.getDisplaySettings() ? viewer.getDisplaySettings() : DisplaySettings::instance().get();
     GraphicsContext::ScreenIdentifier si;
     si.readDISPLAY();
@@ -770 +768 @@
     BufferConfigList depthConfigs;
     vector<int> coverageConfigs;
-    getPossibleConfigs(gc, colorConfigs, depthConfigs, coverageConfigs);
+    getPossibleConfigs(gc.get(), colorConfigs, depthConfigs, coverageConfigs);
     int coverageSampleConfigs = (coverageConfigs.size() - 4) / 2;
     cout << "color configs\nname\tbits\n";
@@ -787 +785 @@
                              colorItr->bits, depthItr->bits);
             FboData data;
-            if (createFBO(gc, config, data))
+            if (createFBO(gc.get(), config, data))
                 validConfigs.push_back(config);
-            destroyFBO(gc, data);
+            destroyFBO(gc.get(), data);
             if (coverageConfigs.size() > 0)
             {
@@ -814 +812 @@
                     config.name = msText.str();
 
-                    if (createFBO(gc, config, data)) {
+                    if (createFBO(gc.get(), config, data)) {
                         validConfigs.push_back( config);
                     }
-                    destroyFBO(gc, data);
+                    destroyFBO(gc.get(), data);
                 }
             }
@@ -886 +884 @@
         camera->attach(Camera::DEPTH_BUFFER, config.depthFormat);
     else if (config.depthFormat == GL_DEPTH_COMPONENT24)
-        camera->attach(Camera::DEPTH_BUFFER, depthTexture24);
+        camera->attach(Camera::DEPTH_BUFFER, depthTexture24.get());
     else
-        camera->attach(Camera::DEPTH_BUFFER, depthTexture);
+        camera->attach(Camera::DEPTH_BUFFER, depthTexture.get());
 }
 
@@ -912 +910 @@
         depthTexture = depthTexture24;
     sw->removeChildren(0, sw->getNumChildren());
-    sw->addChild(createTextureQuad(colorTexture));
-    sw->addChild(createTextureQuad(depthTexture));
-    sw->addChild(createTextureQuad(depthTexture24));
+    sw->addChild(createTextureQuad(colorTexture.get()));
+    sw->addChild(createTextureQuad(depthTexture.get()));
+    sw->addChild(createTextureQuad(depthTexture24.get()));
     sw->setSingleChildOn(0);
     return sw;
@@ -966 +964 @@
     optimizer.optimize(loadedModel.get());
     // creates texture to be rendered
-    Switch* sw = makeTexturesAndGeometry(width, height, appState->sw);
+    Switch* sw = makeTexturesAndGeometry(width, height, appState->sw.get());
     ref_ptr<Camera> rttCamera = makeRttCamera(gc, width, height);
     rttCamera->setRenderOrder(Camera::PRE_RENDER);
-    viewer.addSlave(rttCamera);
+    viewer.addSlave(rttCamera.get());
     appState->camera = rttCamera;
     // geometry and slave camera to display the result
     Group* displayRoot = new Group;
     displayRoot->addChild(sw);
-    displayRoot->addChild(appState->textProjection);
+    displayRoot->addChild(appState->textProjection.get());
     StateSet* displaySS = displayRoot->getOrCreateStateSet();
     displaySS->setMode(GL_LIGHTING, StateAttribute::OFF);
@@ -991 +989 @@
     texCamera->setProjectionResizePolicy(Camera::FIXED);
     viewer.addSlave(texCamera, Matrixd(), Matrixd(), false);
-    viewer.addEventHandler(new ConfigHandler(appState));
+    viewer.addEventHandler(new ConfigHandler(appState.get()));
 
     // add model to the viewer.