patch python builtin generation scripts to handle multiple aliases. TODO - perform tests

Author: AnastaZIuk

src/nbl/builtin/CMakeLists.txt

@@ -239,6 +239,6 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "nbl/builtin/glsl/blit/normalizatio
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "nbl/builtin/glsl/blit/normalization/shared_normalization.glsl")
 
 macro(NBL_ADD_BUILTIN_RESOURCES _TARGET_) # internal for Nabla only
-	ADD_CUSTOM_BUILTIN_RESOURCES("${_TARGET_}" NBL_RESOURCES_TO_EMBED "${NBL_ROOT_PATH}/include" "nbl::builtin" "${NBL_ROOT_PATH_BINARY}/include")
+	ADD_CUSTOM_BUILTIN_RESOURCES("${_TARGET_}" NBL_RESOURCES_TO_EMBED "${NBL_ROOT_PATH}/include" "nbl::builtin" "${NBL_ROOT_PATH_BINARY}/include" "${NBL_ROOT_PATH_BINARY}/src")
 endmacro()
 

src/nbl/builtin/builtinDataGen.py

@@ -20,8 +20,8 @@
     correspondingHeaderFile = sys.argv[5]
 
     with open(resourcesFile, "r") as f:
-        resourcePaths = f.read().rstrip().split(',')
-
+        resourcePaths = f.read().rstrip().readlines()
+       
     #opening a file
     outp = open(outputFilename,"w+")
 
@@ -32,7 +32,10 @@
     outp.write("const std::pair<const uint8_t*, size_t> get_resource();")
 
     # writing binary  data of all files in a loop
-    for x in resourcePaths:
+    for z in resourcePaths:
+        itemData = z.split(',')
+        x = itemData[0]
+    
         outp.write('\n\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>()' % x)
         outp.write('\n\t{')
         outp.write('\n\t\tstatic const uint8_t data[] = {\n\t\t\t')
@@ -56,20 +59,40 @@
         outp.write('\n\t\t};')
         outp.write('\n\t\treturn { data, sizeof(data) };')
         outp.write('\n\t}')
-
-
+        
+        if len(itemData) > 1:
+            for alias in range(1, len(itemData)):
+                outp.write('\n\ttemplate<> const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>()' % alias)
+                outp.write('\n\t{')
+                outp.write('\n\t\treturn get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
+                outp.write('\n\t{')
+            
     outp.write("\tstd::pair<const uint8_t*, size_t> get_resource_runtime(const std::string& filename) {\n")
     outp.write("\t\tstatic std::unordered_map<std::string, int> resourcesByFilename( {\n")
     counter = 1
-    for x in resourcePaths:
+    
+    for z in resourcePaths:
+        itemData = z.split(',')
+        x = itemData[0]
+        
         outp.write("\t\t\t{\"%s\", %d},\n" % (x,counter))
+        
+        if len(itemData) > 1:
+            for alias in range(1, len(itemData)):
+                outp.write("\t\t\t{\"%s\", %d},\n" % (alias,counter))
+                
         counter+= 1
+        
     outp.write("\t\t});\n\n")
     outp.write("\t\tauto resource = resourcesByFilename.find(filename);\n")
     outp.write("\t\tif(resource == resourcesByFilename.end()) return { nullptr,0ull };\n")
     outp.write("\t\tswitch (resource->second) \n\t\t\t{\n")
     counter = 1
-    for x in resourcePaths:
+    
+    for z in resourcePaths:
+        itemData = z.split(',')
+        x = itemData[0]
+        
         outp.write("\t\t\tcase %d:\n\t\t\t\t\treturn get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE(\"%s\")>();\n" % (counter,x))
         counter+= 1
 

src/nbl/builtin/builtinHeaderGen.py

@@ -20,7 +20,7 @@
     guardSuffix = sys.argv[5]
 
     with open(resourcesFile, "r") as f:
-        resourcePaths = f.read().rstrip().split(',')
+        resourcePaths = f.read().rstrip().readlines()
 
     #opening a file
     outp = open(outputFilename,"w+")
@@ -37,8 +37,15 @@
     outp.write("\t\tconst std::pair<const uint8_t*, size_t> get_resource();\n")
 
     #Iterating through input list
-    for x in resourcePaths:
+    for z in resourcePaths:
+        itemData = z.split(',')
+        x = itemData[0]
+        
         outp.write('\n\t\textern template const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % x)
+        
+        if len(itemData) > 1:
+            for alias in range(1, len(itemData)):
+                outp.write('\n\t\textern template const std::pair<const uint8_t*, size_t> get_resource<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("%s")>();' % alias)
 
     outp.write("\n\t}")
     outp.write("\n#endif // _" + guardSuffix + "_BUILTINRESOURCEDATA_H_")

src/nbl/builtin/utils.cmake

@@ -59,7 +59,6 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 		set(_CURRENT_ITEM_ "${X}")
 		string(FIND "${_CURRENT_ITEM_}" "," _FOUND_ REVERSE)
 
-		
 		string(REPLACE "," ";" _ITEM_DATA_ "${_CURRENT_ITEM_}")
 		list(LENGTH _ITEM_DATA_ _ITEM_D_SIZE_)
 		list(GET _ITEM_DATA_ 0 _CURRENT_PATH_) # _LBR_PATH_ path for given bundle
@@ -100,7 +99,7 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 
 	set(NBL_RESOURCES_LIST_FILE "${_OUTPUT_SOURCE_DIRECTORY_}/resources.txt")
 
-	string(REPLACE ";" "," RESOURCES_ARGS "${${_BUNDLE_NAME_}}")
+	string(REPLACE ";" "\n" RESOURCES_ARGS "${_LBR_${_BUNDLE_NAME_}_}")
 	file(WRITE "${NBL_RESOURCES_LIST_FILE}" "${RESOURCES_ARGS}")
 
 	set(NBL_BUILTIN_RESOURCES_HEADER "${_OUTPUT_HEADER_DIRECTORY_}/${NBL_BS_HEADER_FILENAME}")