소스 검색

Properly handle multiple defines in a shader

BearishSun 9 년 전
부모
커밋
621d0f7d33
2개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 4
      Source/BansheeSL/Include/BsSLImporter.h
  2. 2 1
      Source/BansheeSL/Source/BsASTFX.c

+ 4 - 4
Source/BansheeSL/Include/BsSLImporter.h

@@ -22,16 +22,16 @@ namespace BansheeEngine
 		virtual ~SLImporter();
 		virtual ~SLImporter();
 
 
 		/** @copydoc SpecificImporter::isExtensionSupported */
 		/** @copydoc SpecificImporter::isExtensionSupported */
-		virtual bool isExtensionSupported(const WString& ext) const override;
+		bool isExtensionSupported(const WString& ext) const override;
 
 
 		/** @copydoc SpecificImporter::isMagicNumberSupported */
 		/** @copydoc SpecificImporter::isMagicNumberSupported */
-		virtual bool isMagicNumberSupported(const UINT8* magicNumPtr, UINT32 numBytes) const override;
+		bool isMagicNumberSupported(const UINT8* magicNumPtr, UINT32 numBytes) const override;
 
 
 		/** @copydoc SpecificImporter::import */
 		/** @copydoc SpecificImporter::import */
-		virtual SPtr<Resource> import(const Path& filePath, SPtr<const ImportOptions> importOptions) override;
+		SPtr<Resource> import(const Path& filePath, SPtr<const ImportOptions> importOptions) override;
 
 
 		/** @copydoc SpecificImporter::createImportOptions */
 		/** @copydoc SpecificImporter::createImportOptions */
-		virtual SPtr<ImportOptions> createImportOptions() const override;
+		SPtr<ImportOptions> createImportOptions() const override;
 	};
 	};
 
 
 	/** @} */
 	/** @} */

+ 2 - 1
Source/BansheeSL/Source/BsASTFX.c

@@ -225,8 +225,9 @@ void beginCodeBlock(ParseState* parseState)
 		{
 		{
 			appendCodeBlock(parseState, " ", 1);
 			appendCodeBlock(parseState, " ", 1);
 			appendCodeBlock(parseState, parseState->defines[i].expr, (int)strlen(parseState->defines[i].expr));
 			appendCodeBlock(parseState, parseState->defines[i].expr, (int)strlen(parseState->defines[i].expr));
-			appendCodeBlock(parseState, "\n", 1);
 		}
 		}
+
+		appendCodeBlock(parseState, "\n", 1);
 	}
 	}
 }
 }