Fix/font render

learnopengl.vcxproj

@@ -212,6 +212,7 @@
     <ClCompile Include="src\loader\ParticleLoader.cpp" />
     <ClCompile Include="src\animation\RigNode.cpp" />
     <ClCompile Include="src\loader\PrefabLoader.cpp" />
+    <ClCompile Include="src\loader\TextLoader.cpp" />
     <ClCompile Include="src\mesh\AssimpLoader.cpp" />
     <ClCompile Include="src\mesh\LodMesh.cpp" />
     <ClCompile Include="src\mesh\TransformRegistry.cpp" />
@@ -222,16 +223,18 @@
     <ClCompile Include="src\mesh\TextMesh.cpp" />
     <ClCompile Include="src\animation\AnimationSystem.cpp" />
     <ClCompile Include="src\mesh\MeshSet.cpp" />
+    <ClCompile Include="src\mesh\vao\VertexVBO.cpp" />
     <ClCompile Include="src\scene\AnimationUpdater.cpp" />
     <ClCompile Include="src\scene\Updater.cpp" />
+    <ClCompile Include="src\text\TextSystem.cpp" />
     <ClCompile Include="src\text\vao\AtlasTextureVBO.cpp" />
     <ClCompile Include="src\mesh\vao\VertexIndexEBO.cpp" />
     <ClCompile Include="src\mesh\vao\VertexTextureVBO.cpp" />
     <ClCompile Include="src\particle\ParticleSystem.cpp" />
     <ClCompile Include="src\pool\IdHash.cpp" />
     <ClCompile Include="src\pool\Pool_impl.h" />
     <ClCompile Include="src\pool\TypeHandle.cpp" />
-    <ClCompile Include="src\registry\FontRegistry.cpp" />
+    <ClCompile Include="src\text\FontRegistry.cpp" />
     <ClCompile Include="src\pool\NodeHandle.cpp" />
     <ClCompile Include="src\registry\NodeSnapshotRegistry.cpp" />
     <ClCompile Include="src\render\BatchCommand.cpp" />
@@ -353,6 +356,8 @@
     <ClCompile Include="src\render\WindowBuffer.cpp" />
     <ClCompile Include="src\text\FontHandle.cpp" />
     <ClCompile Include="src\text\TextDraw.cpp" />
+    <ClCompile Include="src\text\vao\TextVAO.cpp" />
+    <ClCompile Include="src\text\vao\TextVAO.h" />
     <ClCompile Include="src\util\assimp_util.cpp" />
     <ClCompile Include="src\util\glm_util.cpp" />
     <ClCompile Include="src\util\Log.cpp" />
@@ -419,6 +424,7 @@
     <ClInclude Include="src\loader\FlagContainer.h" />
     <ClInclude Include="src\loader\MeshData.h" />
     <ClInclude Include="src\loader\MeshLoader.h" />
+    <ClInclude Include="src\loader\TextLoader.h" />
     <ClInclude Include="src\mesh\InstanceFlags.h" />
     <ClInclude Include="src\mesh\LoadContext.h" />
     <ClInclude Include="src\loader\converter\DocNode_impl.h" />
@@ -440,6 +446,8 @@
     <ClInclude Include="src\mesh\MeshSet.h" />
     <ClInclude Include="src\mesh\TransformRegistry.h" />
     <ClInclude Include="src\mesh\TransformSSBO.h" />
+    <ClInclude Include="src\mesh\vao\VertexEntry.h" />
+    <ClInclude Include="src\mesh\vao\VertexVBO.h" />
     <ClInclude Include="src\model\NodeFlags.h" />
     <ClInclude Include="src\render\size.h" />
     <ClInclude Include="src\scene\AnimationUpdater.h" />
@@ -484,6 +492,7 @@
     <ClInclude Include="src\animation\AnimationSystem.h" />
     <ClInclude Include="src\animation\BoneTransformSSBO.h" />
     <ClInclude Include="src\scene\Updater.h" />
+    <ClInclude Include="src\text\TextSystem.h" />
     <ClInclude Include="src\util\assimp_util.h" />
     <ClInclude Include="src\mesh\vao\BoneEntry.h" />
     <ClInclude Include="src\mesh\vao\VertexBoneVBO.h" />
@@ -508,7 +517,7 @@
     <ClInclude Include="src\pool\Entry.h" />
     <ClInclude Include="src\pool\IdHash.h" />
     <ClInclude Include="src\pool\TypeHandle.h" />
-    <ClInclude Include="src\registry\FontRegistry.h" />
+    <ClInclude Include="src\text\FontRegistry.h" />
     <ClInclude Include="src\pool\NodeHandle.h" />
     <ClInclude Include="src\pool\Pool.h" />
     <ClInclude Include="src\registry\NodeSnapshotRegistry.h" />

learnopengl.vcxproj.filters

@@ -537,9 +537,6 @@
     <ClCompile Include="src\mesh\Vertex.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\registry\FontRegistry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\mesh\TextMesh.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -696,6 +693,24 @@
     <ClCompile Include="src\loader\MeshLoader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\loader\TextLoader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\text\FontRegistry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\text\TextSystem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\mesh\vao\VertexVBO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\text\vao\TextVAO.h">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\text\vao\TextVAO.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">
@@ -1421,9 +1436,6 @@
     <ClInclude Include="src\mesh\Vertex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\registry\FontRegistry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\mesh\TextMesh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1733,6 +1745,21 @@
     <ClInclude Include="src\mesh\InstanceFlags.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\loader\TextLoader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\text\FontRegistry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\text\TextSystem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\mesh\vao\VertexVBO.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\mesh\vao\VertexEntry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="learnopengl.rc">

scene/assets.yml

@@ -104,8 +104,8 @@ assets:
 
   terrain_grid_size: 64
 
-  batch_size: 1000
-  batch_buffers: 300
+  batch_size: 50
+  batch_buffers: 200
   batch_debug: false
 
   draw_debug: false
@@ -129,8 +129,10 @@ assets:
 
   shadow_polygon_offset_enabled: true
   shadow_polygon_offset: [2, 0.5]
-  shadow_planes: [0.1, 25, 75, 150, 500]
-  shadow_map_sizes: [1024, 1024, 1024, 1024]
+  xshadow_planes: [0.1, 25, 75, 150, 500]
+  xshadow_map_sizes: [1024, 1024, 1024, 1024]
+  shadow_planes: [0.1, 40, 90, 500]
+  shadow_map_sizes: [2048, 1024, 1024]
   shadow_render_frame_start: 0
   shadow_render_frame_step: 1
   shadow_visual: false

scene/scene_airboat.yml

@@ -33,19 +33,21 @@ entities:
         tiling: 5
     program: g_tex
     pos: [0.0, 0.0, -20.0]
-  - name: Airboat
+  - id: airboat_{t}_{c}
     mesh:
       path: airboat_fixed_colors
     program: g_tex
-    pos: [0.0, 0.0, 0.0]
+    clones:
+      - pos: [0.0, 0.0, 0.0]
+      - pos: [20.0, 00.0, 0.0]
   - name: Directional light
     type: origo
     pos: [0, 25, 25]
     light:
       type: directional
       diffuse: [0.9, 0.9, 0.7, 1.0]
       intensity: 40000
-  - name: Giant wooden box
+  - id: giant_wooden_box_{t}_{c}
     mesh:
       path: quad
       material:

scene/scene_asteroids.yml

@@ -32,8 +32,11 @@ entities:
         alpha: true
         render_back: true
     text:
-      font: fps_font
       text: "- fps"
+      font:
+        name: fps_font
+        path: fonts/Vera.ttf
+        size: 36
     program: g_font_render
     shadow_program: shadow_font_render
     pos: [-1.8, 0.95, -2.5]
@@ -144,7 +147,3 @@ entities:
       type: directional
       diffuse: [0.9, 0.9, 0.7, 1.0]
       intensity: 50000
-fonts:
-  - name: fps_font
-    path: fonts/Vera.ttf
-    size: 36

scene/scene_audio.yml

@@ -48,7 +48,7 @@ entities:
         reference_distance: 6
         xautoplay: true
         xlooping: true
-  - name: Four cubes
+  - id: four_cubes_{t}_{c}
     mesh:
       path: texture_cube_3
     program: g_tex

scene/scene_blend.yml

@@ -108,9 +108,12 @@ entities:
         alpha: true
         render_back: true
     text:
-      font: hello_font
       text: Hello world
-    program: font_render
+      fonts:
+        name: hello_font
+        path: fonts/LuckiestGuy.ttf
+        size: 72
+    program: g_font_render
     shadow_program: shadow_font_render
     pos: [-2.5, 0.0, -9.0]
     scale: 0.01
@@ -129,7 +132,3 @@ entities:
       type: directional
       diffuse: [0.7, 0.7, 0.7, 1.0]
       intensity: 40000
-fonts:
-  - name: hello_font
-    path: fonts/LuckiestGuy.ttf
-    size: 72

scene/scene_forest.yml

@@ -166,17 +166,70 @@ entities:
         x_step: 20
         z_step: -20
   - xid: pine_tree_forest_{t}
-    mesh:
-      path: fbx/scenery/trees/SM_TreePine_01b.FBX
-      materials:
-        - name: pine_trunk_pbr
-          alias: MI_TreeBarkPine_01a
-          map_pbr: pine_trunk_pbr
-        - name: pine_leaf_pbr
-          alias: MI_PineTree_01a
-          map_pbr: pine_leaf_pbr
-          alpha: true
-          render_back: true
+    meshes:
+      - path: fbx/scenery/trees/SM_TreePine_01b.FBX
+        lods:
+          - level: 0
+            distance: 200
+        materials:
+          - name: pine_trunk_pbr
+            alias: MI_TreeBarkPine_01a
+            map_pbr: pine_trunk_pbr
+          - name: pine_leaf_pbr
+            alias: MI_PineTree_01a
+            map_pbr: pine_leaf_pbr
+            alpha: true
+            blend: true
+            render_back: true
+      - path: fbx/scenery/trees/SM_TreePine_01b.FBX
+        lods:
+          - level: 1
+            distance: 300
+        materials:
+          - name: pine_trunk_pbr
+            alias: MI_TreeBarkPine_01a
+            map_pbr: pine_trunk_pbr
+          - name: pine_leaf_pbr
+            alias: MI_PineTree_01a
+            map_pbr: pine_leaf_pbr
+            alpha: true
+            render_back: true
+      - path: fbx/scenery/trees/SM_TreePine_01b.FBX
+        lods:
+          - level: 2
+            distance: 400
+        materials:
+          - name: pine_trunk_pbr
+            alias: MI_TreeBarkPine_01a
+            map_kd: pine_trunk_pbr/T_TreePineBark_01a_A.PNG
+          - name: pine_leaf_pbr
+            alias: MI_PineTree_01a
+            map_kd: pine_leaf_pbr/T_PineBranch_01a_A.PNG
+            alpha: true
+            render_back: true
+      - path: fbx/scenery/trees/SM_TreePine_01b.FBX
+        lods:
+          - level: 3
+            distance: 500
+        materials:
+          - name: pine_trunk_pbr
+            alias: MI_TreeBarkPine_01a
+            map_kd: pine_trunk_pbr/T_TreePineBark_01a_A.PNG
+          - name: pine_leaf_pbr
+            alias: MI_PineTree_01a
+            map_kd: pine_leaf_pbr/T_PineBranch_01a_A.PNG
+            alpha: true
+      - path: fbx/scenery/trees/SM_TreePine_01b.FBX
+        lods:
+          - level: 4
+            distance: 10000
+        materials:
+          - name: pine_trunk_pbr
+            alias: MI_TreeBarkPine_01a
+            map_kd: pine_trunk_pbr/T_TreePineBark_01a_A.PNG
+          - name: pine_leaf_pbr
+            alias: MI_PineTree_01a
+            map_kd: pine_leaf_pbr/T_PineBranch_01a_A.PNG
     program: g_tex
     pos: [-1000, 0.0, 0.0]
     render_flags:
@@ -188,8 +241,8 @@ entities:
     generator:
       type: grid
       repeat:
-        x_count: 20
-        z_count: 20
+        x_count: 200
+        z_count: 200
         x_step: 20
         z_step: -20
   - name: wooden floor