From 2eef52078640d15fbebd1f37d3f0730e070e0ea6 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Fri, 7 Jan 2022 17:14:34 +0800
Subject: [PATCH] added axis at Cubemap test,tested ok! that texture files had
 mipmaps...next step should test autogen mipmaps.

---
 example/Vulkan/Cubemap.cpp | 54 +++++++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/example/Vulkan/Cubemap.cpp b/example/Vulkan/Cubemap.cpp
index c6710cd7..f51eec2c 100644
--- a/example/Vulkan/Cubemap.cpp
+++ b/example/Vulkan/Cubemap.cpp
@@ -25,6 +25,11 @@ private:
     Material *          material            =nullptr;
     MaterialInstance *  material_instance   =nullptr;
 
+
+    Material *          axis_material       =nullptr;
+    MaterialInstance *  axis_mi             =nullptr;
+
+    Pipeline *          axis_pipeline       =nullptr;
     Pipeline *          pipeline_solid      =nullptr;
 
     GPUBuffer *         ubo_light           =nullptr;
@@ -33,6 +38,7 @@ private:
     Sampler *           sampler             =nullptr;
     TextureCube *       texture             =nullptr;
 
+    Renderable *        ro_axis             =nullptr;
     Renderable *        ro_cube             =nullptr;
 
 private:
@@ -40,7 +46,18 @@ private:
     bool InitMaterial()
     {
         {
-            texture   =db->LoadTextureCube(OS_TEXT("res/cubemap/Test/Test.TexCube"),false);
+            axis_material=db->CreateMaterial(OS_TEXT("res/material/VertexColor3D"));
+            if(!axis_material)return(false);
+
+            axis_mi=db->CreateMaterialInstance(axis_material);
+            if(!axis_mi)return(false);
+
+            axis_pipeline=CreatePipeline(axis_mi,InlinePipeline::Solid3D,Prim::Lines);
+            if(!axis_pipeline)return(false);
+        }
+
+        {
+            texture   =db->LoadTextureCube(OS_TEXT("res/cubemap/Storforsen4.TexCube"),false);
 
             if(!texture)
                 return(false);
@@ -50,9 +67,9 @@ private:
                 VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
                 nullptr,
                 0,
-                VK_FILTER_NEAREST,
-                VK_FILTER_NEAREST,
-                VK_SAMPLER_MIPMAP_MODE_NEAREST,
+                VK_FILTER_LINEAR,
+                VK_FILTER_LINEAR,
+                VK_SAMPLER_MIPMAP_MODE_LINEAR,
                 VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
                 VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
                 VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,
@@ -98,6 +115,14 @@ private:
 
     void CreateRenderObject()
     {
+        {
+            struct AxisCreateInfo aci;
+
+            aci.size=200;
+
+            ro_axis=CreateRenderableAxis(db,axis_mi->GetVAB(),&aci);
+        }
+
         const VAB *vab=material_instance->GetVAB();
 
         {
@@ -107,6 +132,22 @@ private:
         }
     }
 
+    bool InitUBO()
+    {
+        {
+            MaterialParameters *mp_global=axis_mi->GetMP(DescriptorSetsType::Global);
+
+            if(!mp_global)
+                return(false);
+
+            if(!mp_global->BindUBO("g_camera",GetCameraInfoBuffer()))return(false);
+
+            mp_global->Update();
+        }
+
+        return(true);
+    }
+
     void Add(Renderable *r,Pipeline *pl)
     {
         auto ri=db->CreateRenderableInstance(r,material_instance,pl);
@@ -123,6 +164,8 @@ private:
 
     bool InitScene()
     {
+        render_root.CreateSubNode(db->CreateRenderableInstance(ro_axis,axis_mi,axis_pipeline));
+
         Add(ro_cube,pipeline_solid);
 
         render_root.RefreshMatrix();
@@ -148,6 +191,9 @@ public:
         if(!InitMaterial())
             return(false);
 
+        if(!InitUBO())
+            return(false);
+
         CreateRenderObject();
 
         if(!InitScene())