GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Refactor Streaming with new settings and textures streaming configuration

Browse Source
This commit is contained in:
Wojtek Figat
2021-06-17 15:33:34 +02:00
parent 64501a8645
commit 4744fa05ef
42 changed files with 631 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Engine/Content/Assets/MaterialBase.cpp
View File

@@ -2,6 +2,7 @@
#include "MaterialBase.h"
#include "MaterialInstance.h"
#include "Engine/Core/Log.h"
#include "Engine/Core/Types/Variant.h"
#include "Engine/Content/Content.h"
#include "Engine/Content/Factories/BinaryAssetFactory.h"

1
Source/Engine/Content/Assets/MaterialInstance.cpp
View File

@@ -1,6 +1,7 @@
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
#include "MaterialInstance.h"
#include "Engine/Core/Log.h"
#include "Engine/Core/Types/Variant.h"
#include "Engine/Content/Content.h"
#include "Engine/Content/Upgraders/MaterialInstanceUpgrader.h"

5
Source/Engine/Content/Upgraders/TextureAssetUpgrader.h
View File

@@ -480,7 +480,6 @@ private:
newHeader.IsSRGB = textureHeader.IsSRGB;
newHeader.NeverStream = textureHeader.NeverStream;
newHeader.Type = textureHeader.Type;
newHeader.IsCubeMap = false;
context.Output.CustomData.Copy(&newHeader);
// Convert import options
@@ -535,7 +534,6 @@ private:
newHeader.MipLevels = textureHeader.MipLevels;
newHeader.Format = PixelFormatOldToNew(textureHeader.Format);
newHeader.IsSRGB = textureHeader.IsSRGB;
newHeader.NeverStream = false;
newHeader.Type = TextureFormatType::ColorRGB;
newHeader.IsCubeMap = true;
context.Output.CustomData.Copy(&newHeader);
@@ -617,7 +615,6 @@ private:
newHeader.IsSRGB = textureHeader.IsSRGB;
newHeader.NeverStream = textureHeader.NeverStream;
newHeader.Type = textureHeader.Type;
newHeader.IsCubeMap = false;
context.Output.CustomData.Copy(&newHeader);
// Copy sprite atlas data from old header stream to chunk (chunk 15th)
@@ -696,7 +693,6 @@ private:
newHeader.IsSRGB = textureHeader.IsSRGB;
newHeader.NeverStream = textureHeader.NeverStream;
newHeader.Type = textureHeader.Type;
newHeader.IsCubeMap = false;
auto data = (IESProfile::CustomDataLayout*)newHeader.CustomData;
data->Brightness = brightness;
data->TextureMultiplier = multiplier;
@@ -765,7 +761,6 @@ private:
newHeader.IsSRGB = textureHeader.IsSRGB;
newHeader.NeverStream = textureHeader.NeverStream;
newHeader.Type = textureHeader.Type;
newHeader.IsCubeMap = false;
context.Output.CustomData.Copy(&newHeader);
// Copy asset previews IDs mapping data from old chunk to new one