Implement support for gl 33

supertuxkart · Aug 31, 2014 · 82f84cf · 82f84cf
1 parent 1bd6f20
commit 82f84cf
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 24 deletions.
diff --git a/src/graphics/irr_driver.hpp b/src/graphics/irr_driver.hpp
@@ -303,7 +303,7 @@ class IrrDriver : public IEventReceiver, public NoCopy
 
     bool hasARB_base_instance() const
     {
-        return hasBaseInstance;
+        return false;
     }
 
     bool hasVSLayerExtension() const

diff --git a/src/graphics/stkinstancedscenenode.hpp b/src/graphics/stkinstancedscenenode.hpp
@@ -4,27 +4,6 @@
 #include "stkmesh.hpp"
 #include "utils/leak_check.hpp"
 
-class ListInstancedMatDefault : public MeshList<ListInstancedMatDefault, GLMesh *, size_t>
-{};
-
-class ListInstancedMatNormalMap : public MeshList<ListInstancedMatNormalMap, GLMesh *, size_t>
-{};
-
-class ListInstancedMatAlphaRef : public MeshList<ListInstancedMatAlphaRef, GLMesh *, size_t>
-{};
-
-class ListInstancedMatUnlit : public MeshList<ListInstancedMatUnlit, GLMesh *, size_t>
-{};
-
-class ListInstancedMatSphereMap : public MeshList<ListInstancedMatSphereMap, GLMesh *, size_t>
-{};
-
-class ListInstancedMatDetails : public MeshList<ListInstancedMatDetails, GLMesh *, size_t>
-{};
-
-class ListInstancedMatGrass : public MeshList<ListInstancedMatGrass, GLMesh *, size_t, core::vector3df, core::vector3df>
-{};
-
 class STKInstancedSceneNode : public irr::scene::CMeshSceneNode
 {
 protected:

diff --git a/src/graphics/stkmesh.hpp b/src/graphics/stkmesh.hpp
@@ -100,6 +100,27 @@ class ListMatUnlit : public MeshList<ListMatUnlit, GLMesh *, core::matrix4, core
 class ListMatDetails : public MeshList<ListMatDetails, GLMesh *, core::matrix4, core::matrix4, core::matrix4>
 {};
 
+class ListInstancedMatDefault : public MeshList<ListInstancedMatDefault, GLMesh *, size_t>
+{};
+
+class ListInstancedMatNormalMap : public MeshList<ListInstancedMatNormalMap, GLMesh *, size_t>
+{};
+
+class ListInstancedMatAlphaRef : public MeshList<ListInstancedMatAlphaRef, GLMesh *, size_t>
+{};
+
+class ListInstancedMatUnlit : public MeshList<ListInstancedMatUnlit, GLMesh *, size_t>
+{};
+
+class ListInstancedMatSphereMap : public MeshList<ListInstancedMatSphereMap, GLMesh *, size_t>
+{};
+
+class ListInstancedMatDetails : public MeshList<ListInstancedMatDetails, GLMesh *, size_t>
+{};
+
+class ListInstancedMatGrass : public MeshList<ListInstancedMatGrass, GLMesh *, size_t, core::vector3df, core::vector3df>
+{};
+
 class ListBlendTransparent : public MeshList<ListBlendTransparent, GLMesh *, core::matrix4, core::matrix4>
 {};
 

diff --git a/src/graphics/stkscenemanager.cpp b/src/graphics/stkscenemanager.cpp
@@ -146,8 +146,44 @@ parseSceneManager(core::list<scene::ISceneNode*> List, std::vector<STKMeshSceneN
                 GLMesh *mesh;
                 if (!IsCulledForSolid)
                 {
-                    for_in(mesh, node->MeshSolidMaterial[Mat])
-                        MeshForSolidPass[Mat][mesh->mb].push_back(std::make_pair(mesh, *I));
+                    if (irr_driver->hasARB_base_instance())
+                    {
+                        for_in(mesh, node->MeshSolidMaterial[Mat])
+                            MeshForSolidPass[Mat][mesh->mb].push_back(std::make_pair(mesh, *I));
+                    }
+                    else
+                    {
+                        core::matrix4 ModelMatrix, InvModelMatrix;
+                        (*I)->getAbsoluteTransformation().getInverse(ModelMatrix);
+
+                        for_in(mesh, node->MeshSolidMaterial[Mat])
+                        {
+                            switch (Mat)
+                            {
+                            case MAT_DEFAULT:
+                                ListMatDefault::getInstance()->push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                                break;
+                            case MAT_ALPHA_REF:
+                                ListMatAlphaRef::getInstance()->push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                                break;
+                            case MAT_NORMAL_MAP:
+                                ListMatNormalMap::getInstance()->push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                                break;
+                            case MAT_DETAIL:
+                                ListMatDetails::getInstance()->push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                                break;
+                            case MAT_UNLIT:
+                                ListMatUnlit::getInstance()->push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                                break;
+                            case MAT_SPHEREMAP:
+                                ListMatSphereMap::getInstance()->push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix, mesh->TextureMatrix));
+                                break;
+                            case MAT_SPLATTING:
+                                ListMatSplatting::getInstance()->push_back(STK::make_tuple(mesh, ModelMatrix, InvModelMatrix));
+                                break;
+                            }
+                        }
+                    }
                 }
                 for (unsigned cascade = 0; cascade < 4; ++cascade)
                 {