summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorraysan5 <[email protected]>2020-09-26 11:51:42 +0200
committerraysan5 <[email protected]>2020-09-26 11:51:42 +0200
commitc2e56f2604f2cbbce37561fe49be40fd884d23ad (patch)
tree089e8960c024f49c9cc0a59c5181772829a17398 /src
parentb9053eebe7ef9810ed685f4dadbff45d3128beed (diff)
downloadraylib-c2e56f2604f2cbbce37561fe49be40fd884d23ad.tar.gz
raylib-c2e56f2604f2cbbce37561fe49be40fd884d23ad.zip
REVIEW: GenTextureCubemap(), avoid using models.c functions
- DrawCube() belongs to models.c -> rl*() alternative should be used
Diffstat (limited to 'src')
-rw-r--r--src/rlgl.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/rlgl.h b/src/rlgl.h
index 97429ca8..0869d118 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -3327,8 +3327,10 @@ TextureCubemap GenTextureCubemap(Shader shader, Texture2D panorama, int size, in
};
rlEnableShader(shader.id);
- //glActiveTexture(GL_TEXTURE0);
- //glBindTexture(GL_TEXTURE_2D, panorama.id);
+#if !defined(GENTEXTURECUBEMAP_USE_BATCH_SYSTEM)
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, panorama.id);
+#endif
rlViewport(0, 0, size, size); // Set viewport to current fbo dimensions
@@ -3338,14 +3340,18 @@ TextureCubemap GenTextureCubemap(Shader shader, Texture2D panorama, int size, in
rlFramebufferAttach(fbo, cubemap.id, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_CUBEMAP_POSITIVE_X + i);
rlEnableFramebuffer(fbo);
+#if defined(GENTEXTURECUBEMAP_USE_BATCH_SYSTEM)
rlEnableTexture(panorama.id); // WARNING: It must be called after enabling current framebuffer if using internal batch system!
-
+#endif
rlClearScreenBuffers();
- //GenDrawCube();
+ GenDrawCube();
+#if defined(GENTEXTURECUBEMAP_USE_BATCH_SYSTEM)
// Using internal batch system instead of raw OpenGL cube creating+drawing
+ // NOTE: DrawCubeV() is actually provided by models.c! -> GenTextureCubemap() should be moved to user code!
DrawCubeV(Vector3Zero(), Vector3One(), WHITE);
DrawRenderBatch(RLGL.currentBatch);
+#endif
}
//------------------------------------------------------------------------------------------