Skip to content

Commit 8edd12b

Browse files
CheaterdevCheaterdev
committed
blobs
1 parent 54d3cfe commit 8edd12b

File tree

14 files changed

+47
-23
lines changed

14 files changed

+47
-23
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ AgilitySDK/
1313
*.nv-gpudmp*
1414

1515
#VS-specific
16+
*.blob.cpp
1617
*.user
1718
obj/
1819
bin/

‎main.sharpmake.cs

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Spectrum
2121
[Fragment, Flags]
2222
public enum Mode
2323
{
24-
Debug = 1,
24+
Dev = 1,
2525
Profile = 2,
2626
Retail = 4
2727
}
@@ -56,18 +56,19 @@ public Common() : base(typeof(CustomTarget))
5656
Platform = Platform.win64,
5757
DevEnv = DevEnv.vs2019,
5858
Optimization = Optimization.Release,
59-
Mode = Mode.Debug | Mode.Profile | Mode.Retail
59+
Mode = Mode.Dev | Mode.Profile | Mode.Retail
6060
});
6161

6262
CustomProperties.Add("VcpkgEnabled", "true");
6363
CustomProperties.Add("VcpkgEnableManifest", "true");
6464
CustomProperties.Add("VcpkgTriplet", "x64-windows-static");
65-
//CustomProperties.Add("VcpkgConfiguration", "Release");
65+
CustomProperties.Add("VcpkgConfiguration", "Release");
6666
}
6767

6868
[Configure]
6969
public virtual void ConfigureAll(Configuration conf, CustomTarget target)
7070
{
71+
conf.IsBlobbed = true;
7172
conf.ProjectFileName = "[project.Name]";
7273
conf.ProjectPath = @"[project.RootPath]";
7374

@@ -103,7 +104,7 @@ public virtual void ConfigureAll(Configuration conf, CustomTarget target)
103104

104105
conf.Options.Add(new Sharpmake.Options.Vc.Compiler.DisableSpecificWarnings("4005", "5104", "5105", "5106")); //module reference issues
105106

106-
if (target.Mode == Mode.Debug)
107+
if (target.Mode == Mode.Dev)
107108
{
108109
conf.Options.Add(Options.Vc.Compiler.Optimization.Disable);
109110
conf.Options.Add(Options.Vc.Compiler.Inline.Disable);
@@ -244,7 +245,7 @@ public override void ConfigureAll(Configuration conf, CustomTarget target)
244245
// conf.PrecompSource = "pch.cpp";
245246

246247
// conf.LibraryFiles.Add("Dbghelp.lib");
247-
conf.LibraryFiles.Add("Onecore.lib");
248+
//
248249

249250
conf.AddPublicDependency<Modules>(target);
250251

@@ -363,6 +364,8 @@ public override void ConfigureAll(Configuration conf, CustomTarget target)
363364
//conf.PrecompHeader = "pch.h";
364365
//conf.PrecompSource = "pch.cpp";
365366

367+
conf.LibraryFiles.Add("Onecore.lib");
368+
366369
conf.VcxprojUserFile = new Project.Configuration.VcxprojUserFileSettings();
367370
conf.VcxprojUserFile.LocalDebuggerWorkingDirectory = @"[project.SharpmakeCsPath]\workdir";
368371

@@ -395,8 +398,8 @@ public SpectrumSolution()
395398
{
396399
Platform = Platform.win64,
397400
DevEnv = DevEnv.vs2019,
398-
Optimization = Optimization.Release,
399-
Mode = Mode.Debug | Mode.Profile | Mode.Retail
401+
Optimization = Optimization.Release,
402+
Mode = Mode.Dev | Mode.Profile | Mode.Retail
400403
});
401404
}
402405

@@ -406,10 +409,19 @@ public void ConfigureAll(Configuration conf, CustomTarget target)
406409
conf.SolutionFileName = "Spectrum";
407410
conf.SolutionPath = @"[solution.SharpmakeCsPath]\projects\";
408411
string platformName = string.Empty;
409-
412+
/*
413+
switch (target.Optimization)
414+
{
415+
case Optimization.Debug: platformName += "Debug "; break;
416+
case Optimization.Release: platformName += "Release "; break;
417+
default:
418+
throw new NotImplementedException();
419+
}
420+
*/
421+
410422
switch (target.Mode)
411423
{
412-
case Mode.Debug: platformName += "Debug"; break;
424+
case Mode.Dev: platformName += "Dev"; break;
413425
case Mode.Retail: platformName += "Retail"; break;
414426
case Mode.Profile: platformName += "Profile"; break;
415427
default:

‎sources/3rdparty/ZipLib/ZipFile.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2+
13
#include "ZipFile.h"
24

35
#include "utils/stream_utils.h"
@@ -6,7 +8,7 @@
68
#include <cassert>
79
#include <stdexcept>
810

9-
namespace
11+
namespace ZipFileInternal
1012
{
1113
std::string GetFilenameFromPath(const std::string& fullPath)
1214
{
@@ -62,7 +64,7 @@ void ZipFile::Save(ZipArchive::Ptr zipArchive, const std::string& zipPath)
6264
void ZipFile::SaveAndClose(ZipArchive::Ptr zipArchive, const std::string& zipPath)
6365
{
6466
// check if file exist
65-
std::string tempZipPath = MakeTempFilename(zipPath);
67+
std::string tempZipPath = ZipFileInternal::MakeTempFilename(zipPath);
6668
std::ofstream outZipFile;
6769
outZipFile.open(tempZipPath, std::ios::binary | std::ios::trunc);
6870

@@ -88,7 +90,7 @@ bool ZipFile::IsInArchive(const std::string& zipPath, const std::string& fileNam
8890

8991
void ZipFile::AddFile(const std::string& zipPath, const std::string& fileName, ICompressionMethod::Ptr method)
9092
{
91-
AddFile(zipPath, fileName, GetFilenameFromPath(fileName), method);
93+
AddFile(zipPath, fileName, ZipFileInternal::GetFilenameFromPath(fileName), method);
9294
}
9395

9496
void ZipFile::AddFile(const std::string& zipPath, const std::string& fileName, const std::string& inArchiveName, ICompressionMethod::Ptr method)
@@ -98,12 +100,12 @@ void ZipFile::AddFile(const std::string& zipPath, const std::string& fileName, c
98100

99101
void ZipFile::AddEncryptedFile(const std::string& zipPath, const std::string& fileName, const std::string& password, ICompressionMethod::Ptr method)
100102
{
101-
AddEncryptedFile(zipPath, fileName, GetFilenameFromPath(fileName), std::string(), method);
103+
AddEncryptedFile(zipPath, fileName, ZipFileInternal::GetFilenameFromPath(fileName), std::string(), method);
102104
}
103105

104106
void ZipFile::AddEncryptedFile(const std::string& zipPath, const std::string& fileName, const std::string& inArchiveName, const std::string& password, ICompressionMethod::Ptr method)
105107
{
106-
std::string tmpName = MakeTempFilename(zipPath);
108+
std::string tmpName = ZipFileInternal::MakeTempFilename(zipPath);
107109

108110
{
109111
ZipArchive::Ptr zipArchive = ZipFile::Open(zipPath);
@@ -155,7 +157,7 @@ void ZipFile::AddEncryptedFile(const std::string& zipPath, const std::string& fi
155157

156158
void ZipFile::ExtractFile(const std::string& zipPath, const std::string& fileName)
157159
{
158-
ExtractFile(zipPath, fileName, GetFilenameFromPath(fileName));
160+
ExtractFile(zipPath, fileName, ZipFileInternal::GetFilenameFromPath(fileName));
159161
}
160162

161163
void ZipFile::ExtractFile(const std::string& zipPath, const std::string& fileName, const std::string& destinationPath)
@@ -165,7 +167,7 @@ void ZipFile::ExtractFile(const std::string& zipPath, const std::string& fileNam
165167

166168
void ZipFile::ExtractEncryptedFile(const std::string& zipPath, const std::string& fileName, const std::string& password)
167169
{
168-
ExtractEncryptedFile(zipPath, fileName, GetFilenameFromPath(fileName), password);
170+
ExtractEncryptedFile(zipPath, fileName, ZipFileInternal::GetFilenameFromPath(fileName), password);
169171
}
170172

171173
void ZipFile::ExtractEncryptedFile(const std::string& zipPath, const std::string& fileName, const std::string& destinationPath, const std::string& password)
@@ -207,7 +209,7 @@ void ZipFile::ExtractEncryptedFile(const std::string& zipPath, const std::string
207209

208210
void ZipFile::RemoveEntry(const std::string& zipPath, const std::string& fileName)
209211
{
210-
std::string tmpName = MakeTempFilename(zipPath);
212+
std::string tmpName = ZipFileInternal::MakeTempFilename(zipPath);
211213

212214
{
213215
ZipArchive::Ptr zipArchive = ZipFile::Open(zipPath);

‎sources/DirectXFramework/DX12/Tiling.ixx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export module Tiling;
77
import Vectors;
88
import Memory;
99
import Events;
10-
10+
import stl.core;
1111
export
1212
{
1313

‎sources/RenderSystem/Assets/AssetRenderer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma once
12
#include "Renderer/Renderer.h"
23
#include "Assets/MaterialAsset.h"
34
#include "Assets/TextureAsset.h"

‎sources/RenderSystem/Effects/RTX/RTX.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma once
12
#include "Materials/universal_material.h"
23
#include "Assets/MeshAsset.h"
34

‎sources/RenderSystem/Font/TextSystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
#pragma once
22
#include "FW1FontWrapper/Source/FW1FontWrapper.h"
33
typedef ComPtr<IFW1Factory> FW1_Factory;
44
typedef ComPtr<IFW1FontWrapper> FW1_Font;

‎sources/RenderSystem/GUI/Elements/AssetExplorer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma once
12
#include "Assets/Asset.h"
23
#include "GUI/Elements/Container.h"
34
#include "GUI/Elements/StatusBar.h"

‎sources/RenderSystem/GUI/Elements/ComboBox.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#include "MenuList.h"
1+
#pragma once
2+
#include "MenuList.h"
23
#include "Button.h"
34

45
namespace GUI

‎sources/RenderSystem/GUI/Elements/FlowGraph/FlowManager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma once
12
import FlowGraph;
23
#include "GUI/Elements/FlowGraph/Canvas.h"
34
#include "GUI/Elements/TabControl.h"

‎sources/RenderSystem/Materials/ShaderMaterial.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#pragma once
2+
13
#include "Assets/MaterialAsset.h"
24

35
class ShaderMaterial: public materials::material, public AssetHolder

‎sources/RenderSystem/Materials/Values.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma once
12
import FlowGraph;
23
#include "Assets/TextureAsset.h"
34
#include "GUI/Elements/FlowGraph/ComponentWindow.h"

‎sources/Spectrum/Platform/Window.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma once
12
import Application;
23
#include "GUI/GUI.h"
34

‎workdir/shaders/autogen/VoxelOutput.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ ConstantBuffer<Pass_VoxelOutput> pass_VoxelOutput: register( b2, space6);
1818
const VoxelOutput CreateVoxelOutput()
1919
{
2020
VoxelOutput result;
21-
result.uav.noise = ResourceDescriptorHeap[pass_VoxelOutput.uav_0];
22-
result.uav.frames = ResourceDescriptorHeap[pass_VoxelOutput.uav_1];
23-
result.uav.DirAndPdf = ResourceDescriptorHeap[pass_VoxelOutput.uav_2];
21+
result.uav.noise = uav_6_0;// ResourceDescriptorHeap[pass_VoxelOutput.uav_0];
22+
result.uav.frames = uav_6_1;// ResourceDescriptorHeap[pass_VoxelOutput.uav_1];
23+
result.uav.DirAndPdf = uav_6_2;// ResourceDescriptorHeap[pass_VoxelOutput.uav_2];
2424
return result;
2525
}
2626
#ifndef NO_GLOBAL

0 commit comments

Comments
 (0)