Implement DepthTexture #310

Author: markaren

examples/textures/depth_texture.cpp

@@ -60,9 +60,9 @@ int main() {
     options.stencilBuffer = false;
     options.depthBuffer = true;
 
-    options.depthTexture = DepthTexture::create(0,0);
+    options.depthTexture = DepthTexture::create();
     options.depthTexture->format = Format::Depth;
-    options.depthTexture->type = Type::UnsignedShort;
+    options.depthTexture->type = Type::Float;
 
 
     GLRenderTarget target(canvas.size().width(), canvas.size().height(), options);
@@ -72,13 +72,13 @@ int main() {
     postMaterial->vertexShader = R"(
         varying vec2 vUv;
 
-			void main() {
-				vUv = uv;
-				gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
-			}
+		void main() {
+			vUv = uv;
+			gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
+		}
     )";
     postMaterial->fragmentShader = R"(
-       #include <packing>
+            #include <packing>
 
 			varying vec2 vUv;
 			uniform sampler2D tDiffuse;
@@ -95,7 +95,7 @@ int main() {
 
 			void main() {
 				//vec3 diffuse = texture2D( tDiffuse, vUv ).rgb;
-				float depth = readDepth( tDepth, vUv )*100000;
+				float depth = readDepth( tDepth, vUv );
 
 				gl_FragColor.rgb = 1 - vec3( depth );
 				gl_FragColor.a = 1.0;

include/threepp/textures/DepthTexture.hpp

@@ -10,10 +10,10 @@ namespace threepp {
     class DepthTexture: public Texture {
 
     public:
-        static std::shared_ptr<DepthTexture> create(unsigned width, unsigned height, std::optional<Type> type = std::nullopt, Format format = Format::Depth);
+        static std::shared_ptr<DepthTexture> create(std::optional<Type> type = std::nullopt, Format format = Format::Depth);
 
     private:
-        DepthTexture(unsigned width, unsigned height, std::optional<Type> type, Format format);
+        DepthTexture(std::optional<Type> type, Format format);
     };
 
 }// namespace threepp

src/threepp/renderers/gl/GLTextures.cpp

@@ -148,8 +148,6 @@ void gl::GLTextures::uploadTexture(TextureProperties* textureProperties, Texture
 
     if (dynamic_cast<DepthTexture*>(&texture)) {
 
-        glInternalFormat = GL_DEPTH_COMPONENT;
-
         if (texture.type == Type::Float) {
 
             glInternalFormat = GL_DEPTH_COMPONENT32F;
@@ -164,39 +162,7 @@ void gl::GLTextures::uploadTexture(TextureProperties* textureProperties, Texture
 
         } else {
 
-            glInternalFormat = GL_DEPTH_COMPONENT16;
-        }
-
-        if (texture.format == Format::Depth && glInternalFormat == GL_DEPTH_COMPONENT) {
-
-            // The error INVALID_OPERATION is generated by texImage2D if format and internalformat are
-            // DEPTH_COMPONENT and type is not UNSIGNED_SHORT or UNSIGNED_INT
-            // (https://www.khronos.org/registry/webgl/extensions/WEBGL_depth_texture/)
-            if (texture.type != Type::UnsignedShort && texture.type != Type::UnsignedInt) {
-
-                std::cerr << "THREE.GLRenderer: Use UnsignedShortType or UnsignedIntType for DepthFormat DepthTexture." << std::endl;
-
-                texture.type = Type::UnsignedShort;
-                glType = toGLType(texture.type);
-            }
-        }
-
-        if (texture.format == Format::DepthStencil && glInternalFormat == GL_DEPTH_COMPONENT) {
-
-            // Depth stencil textures need the DEPTH_STENCIL internal format
-            // (https://www.khronos.org/registry/webgl/extensions/WEBGL_depth_texture/)
-            glInternalFormat = GL_DEPTH_STENCIL;
-
-            // The error INVALID_OPERATION is generated by texImage2D if format and internalformat are
-            // DEPTH_STENCIL and type is not UNSIGNED_INT_24_8_WEBGL.
-            // (https://www.khronos.org/registry/webgl/extensions/WEBGL_depth_texture/)
-            if (texture.type != Type::UnsignedInt248) {
-
-                std::cerr << "THREE.GLRenderer: Use UnsignedInt248Type for DepthStencilFormat DepthTexture." << std::endl;
-
-                texture.type = Type::UnsignedInt248;
-                glType = toGLType(texture.type);
-            }
+            glInternalFormat = GL_DEPTH_COMPONENT24;
         }
 
         //
@@ -514,11 +480,17 @@ void gl::GLTextures::setupDepthTexture(unsigned int framebuffer, GLRenderTarget*
     if (renderTarget->depthTexture->format == Format::Depth) {
 
         glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, *glDepthTexture, 0);
-
+        GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+        if (status != GL_FRAMEBUFFER_COMPLETE) {
+            std::cerr << "GLTextures: Depth texture framebuffer (depth) incomplete: 0x" << std::hex << status << std::dec << std::endl;
+        }
     } else if (renderTarget->depthTexture->format == Format::DepthStencil) {
 
         glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, *glDepthTexture, 0);
-
+        GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+        if (status != GL_FRAMEBUFFER_COMPLETE) {
+            std::cerr << "GLTextures: Depth texture framebuffer (stencil) incomplete: 0x" << std::hex << status << std::dec << std::endl;
+        }
     } else {
 
         throw std::runtime_error("Unknown depthTexture format");

src/threepp/textures/DepthTexture.cpp

@@ -3,8 +3,8 @@
 
 using namespace threepp;
 
-DepthTexture::DepthTexture(unsigned width, unsigned height,std::optional<Type> type, Format format)
-    : Texture({Image(std::vector<unsigned char>(width * height * 4, 255), width, height)}) {
+DepthTexture::DepthTexture(std::optional<Type> type, Format format)
+    : Texture({Image({}, 0, 0)}) {
 
     if ( !type && format == Format::Depth ) type = Type::UnsignedShort;
     if ( !type && format == Format::DepthStencil ) type = Type::UnsignedInt248;
@@ -15,6 +15,6 @@ DepthTexture::DepthTexture(unsigned width, unsigned height,std::optional<Type> t
     generateMipmaps = false;
 }
 
-std::shared_ptr<DepthTexture> DepthTexture::create(unsigned width, unsigned height, std::optional<Type> type, Format format) {
-    return std::shared_ptr<DepthTexture>(new DepthTexture(width, height, type, format));
+std::shared_ptr<DepthTexture> DepthTexture::create(std::optional<Type> type, Format format) {
+    return std::shared_ptr<DepthTexture>(new DepthTexture(type, format));
 }