Skip to content

Commit

Permalink
Fix loosing pipeline.
Browse files Browse the repository at this point in the history
  • Loading branch information
@patuwwy
patuwwy committed May 9, 2019
1 parent 50b4654 commit cf2cb75
Show file tree
Hide file tree
Showing 17 changed files with 219 additions and 204 deletions.
49 changes: 15 additions & 34 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,15 @@
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

*.db
*.exe
exe/
*.wav
.vs
*.VC.db
/*.sdf
*.tlog
*.log
Debug
Release
git
clinkster
*/Oidos_2.1.0/vst/
*/Oidos_2.1.0/examples/
*.opendb
Binary file modified Outside/debug/4verts_deb.pdb
View file
Binary file not shown.
66 changes: 33 additions & 33 deletions Outside/debug/Outside.Build.CppClean.log
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
d:\!!scene\rw2018\outside\debug\vc140.pdb
d:\!!scene\rw2018\outside\debug\ext.sbr
d:\!!scene\rw2018\outside\debug\intro.sbr
d:\!!scene\rw2018\outside\debug\main_win_deb.sbr
d:\!!scene\rw2018\outside\debug\main_win_deb.obj
d:\!!scene\rw2018\outside\debug\intro.obj
d:\!!scene\rw2018\outside\debug\ext.obj
d:\!!scene\rw2018\outside\debug\outside.ilk
d:\!!scene\rw2018\outside\debug\outside.exe
d:\!!scene\rw2018\outside\debug\4verts_deb.pdb
d:\!!scene\rw2018\outside\debug\outside.bsc
e:\!!scene\rw2018\outside\debug\main_win_deb.obj
e:\!!scene\rw2018\outside\debug\ext.obj
e:\!!scene\rw2018\outside\debug\intro.obj
e:\!!scene\rw2018\outside\debug\outside.ilk
e:\!!scene\rw2018\outside\debug\vc140.pdb
e:\!!scene\rw2018\outside\debug\4verts_deb.pdb
e:\!!scene\rw2018\outside\debug\outside.bsc
e:\!!scene\rw2018\outside\debug\ext.sbr
e:\!!scene\rw2018\outside\debug\main_win_deb.sbr
e:\!!scene\rw2018\outside\debug\intro.sbr
e:\!!scene\rw2018\outside\.\debug\outside.exe
e:\!!scene\rw2018\outside\.\debug\outside.bsc
e:\!!scene\rw2018\outside\.\debug\outside.ilk
e:\!!scene\rw2018\outside\debug\outside.tlog\cl.read.1.tlog
e:\!!scene\rw2018\outside\debug\outside.tlog\cl.write.1.tlog
e:\!!scene\rw2018\outside\debug\outside.tlog\cl.command.1.tlog
e:\!!scene\rw2018\outside\debug\outside.tlog\link.read.1.tlog
e:\!!scene\rw2018\outside\debug\outside.tlog\link.write.1.tlog
e:\!!scene\rw2018\outside\debug\outside.tlog\link.command.1.tlog
e:\!!scene\rw2018\outside\debug\outside.tlog\bscmake.read.1.tlog
e:\!!scene\rw2018\outside\debug\outside.tlog\bscmake.write.1.tlog
e:\!!scene\rw2018\outside\debug\outside.tlog\bscmake.command.1.tlog
k:\!!scene\rw2018 — kopia (2)\outside\debug\ext.sbr
k:\!!scene\rw2018 — kopia (2)\outside\debug\intro.sbr
k:\!!scene\rw2018 — kopia (2)\outside\debug\main_win_deb.sbr
k:\!!scene\rw2018 — kopia (2)\outside\debug\outside.bsc
k:\!!scene\rw2018 — kopia (2)\outside\debug\vc140.pdb
k:\!!scene\rw2018 — kopia (2)\outside\debug\main_win_deb.obj
k:\!!scene\rw2018 — kopia (2)\outside\debug\intro.obj
k:\!!scene\rw2018 — kopia (2)\outside\debug\ext.obj
k:\!!scene\rw2018 — kopia (2)\outside\debug\outside.ilk
k:\!!scene\rw2018 — kopia (2)\outside\debug\outside.exe
k:\!!scene\rw2018 — kopia (2)\outside\debug\4verts_deb.pdb
f:\repos\rw2018\outside\debug\ext.obj
f:\repos\rw2018\outside\debug\intro.obj
f:\repos\rw2018\outside\debug\main_win_deb.obj
f:\repos\rw2018\outside\debug\outside.ilk
f:\repos\rw2018\outside\debug\4verts_deb.pdb
f:\repos\rw2018\outside\debug\vc140.pdb
f:\repos\rw2018\outside\debug\outside.bsc
f:\repos\rw2018\outside\debug\ext.sbr
f:\repos\rw2018\outside\debug\intro.sbr
f:\repos\rw2018\outside\debug\main_win_deb.sbr
f:\repos\rw2018\outside\.\debug\outside.exe
f:\repos\rw2018\outside\.\debug\outside.bsc
f:\repos\rw2018\outside\.\debug\outside.ilk
f:\repos\rw2018\outside\debug\outside.tlog\bscmake.command.1.tlog
f:\repos\rw2018\outside\debug\outside.tlog\bscmake.read.1.tlog
f:\repos\rw2018\outside\debug\outside.tlog\bscmake.write.1.tlog
f:\repos\rw2018\outside\debug\outside.tlog\cl.command.1.tlog
f:\repos\rw2018\outside\debug\outside.tlog\cl.read.1.tlog
f:\repos\rw2018\outside\debug\outside.tlog\cl.write.1.tlog
f:\repos\rw2018\outside\debug\outside.tlog\link.command.1.tlog
f:\repos\rw2018\outside\debug\outside.tlog\link.read.1.tlog
f:\repos\rw2018\outside\debug\outside.tlog\link.write.1.tlog
Binary file modified Outside/debug/Outside.bsc
View file
Binary file not shown.
Binary file modified Outside/debug/Outside.ilk
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions Outside/debug/Outside.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1490,26 +1490,26 @@ LINK : warning LNK4044: unrecognized option '/CRINKLER'; ignored
/v
/x
/fo
"C:\Users\Patu\AppData\Local\Temp\lnk{636C01B9-7449-43CB-B663-5F68CD8BFEA5}.tmp"
"C:\Users\Patu\AppData\Local\Temp\lnk{2F1C5B41-2383-4FC2-8139-86299ECE95A1}.tmp"
"C:\Users\Patu\AppData\Local\Temp\lnk{26E8D2CA-0FD4-4555-A055-708D015032B9}.tmp"
"C:\Users\Patu\AppData\Local\Temp\lnk{CF6E9C18-B234-4356-AAF8-81861A465FC0}.tmp"
Microsoft (R) Windows (R) Resource Compiler Version 6.3.9600.17336

Copyright (C) Microsoft Corporation. All rights reserved.


Creating C:\Users\Patu\AppData\Local\Temp\lnk{636C01B9-7449-43CB-B663-5F68CD8BFEA5}.tmp
Creating C:\Users\Patu\AppData\Local\Temp\lnk{26E8D2CA-0FD4-4555-A055-708D015032B9}.tmp

Using codepage 1250 as default

C:\Users\Patu\AppData\Local\Temp\lnk{2F1C5B41-2383-4FC2-8139-86299ECE95A1}.tmp.
C:\Users\Patu\AppData\Local\Temp\lnk{CF6E9C18-B234-4356-AAF8-81861A465FC0}.tmp.
Writing 24:1, lang:0x409, size 381

Invoking cvtres.exe:
/machine:x86
/verbose
/out:"C:\Users\Patu\AppData\Local\Temp\lnk{E0BE106C-A786-4A1C-90D2-5A3841F65174}.tmp"
/out:"C:\Users\Patu\AppData\Local\Temp\lnk{46855930-E726-4470-88C4-41F5E3623260}.tmp"
/readonly
"C:\Users\Patu\AppData\Local\Temp\lnk{636C01B9-7449-43CB-B663-5F68CD8BFEA5}.tmp"
"C:\Users\Patu\AppData\Local\Temp\lnk{26E8D2CA-0FD4-4555-A055-708D015032B9}.tmp"
Microsoft (R) Windows Resource To Object Converter Version 14.00.24210.0
Copyright (C) Microsoft Corporation. All rights reserved.

Expand Down Expand Up @@ -1898,5 +1898,5 @@ LINK : warning LNK4044: unrecognized option '/CRINKLER'; ignored
libucrt.lib(cfout.obj)
libucrt.lib(atox.obj)
Finished pass 2
Outside.vcxproj -> E:\!!Scene\rw2018\Outside\.\debug\Outside.exe
Outside.vcxproj -> E:\!!Scene\rw2018\Outside\.\debug\4verts_deb.pdb (Full PDB)
Outside.vcxproj -> F:\repos\rw2018\Outside\.\debug\Outside.exe
Outside.vcxproj -> F:\repos\rw2018\Outside\.\debug\4verts_deb.pdb (Full PDB)
Binary file modified Outside/debug/vc140.pdb
View file
Binary file not shown.
Binary file added Outside/src/ftol.obj
View file
Binary file not shown.
18 changes: 9 additions & 9 deletions Outside/src/intro.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void intro_init()
char* bufferInit;
HANDLE handle;

handle = CreateFile("D:/!!Scene/rw2018/Outside/src/shaders/common_init.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
handle = CreateFile("../src/shaders/common_init.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (handle == INVALID_HANDLE_VALUE) {
MessageBoxA(nullptr, "../src/shaders/common_init.frag", "/common_init.frag", MB_ICONERROR | MB_OK); return 0;
}
Expand All @@ -84,7 +84,7 @@ void intro_init()

/// first shader

handle = CreateFile("D:/!!Scene/rw2018/Outside/src/shaders/calc.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
handle = CreateFile("../src/shaders/calc.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (handle == INVALID_HANDLE_VALUE) {
MessageBoxA(nullptr, "../src/shaders/calc.frag", "/calc.frag", MB_ICONERROR | MB_OK); return 0;
}
Expand All @@ -100,7 +100,7 @@ void intro_init()

/// second shader

handle = CreateFile("D:/!!Scene/rw2018/Outside/src/shaders/scene1.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
handle = CreateFile("../src/shaders/scene1.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (handle == INVALID_HANDLE_VALUE) {
MessageBoxA(nullptr, "../src/shaders/scene1.frag", "/scene1.frag", MB_ICONERROR | MB_OK); return 0;
}
Expand All @@ -115,7 +115,7 @@ void intro_init()



handle = CreateFile("D:/!!Scene/rw2018/Outside/src/shaders/scene2.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
handle = CreateFile("../src/shaders/scene2.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (handle == INVALID_HANDLE_VALUE) {
MessageBoxA(nullptr, "../src/shaders/scene2.frag", "/scene2.frag", MB_ICONERROR | MB_OK); return 0;
}
Expand All @@ -130,7 +130,7 @@ void intro_init()



handle = CreateFile("D:/!!Scene/rw2018/Outside/src/shaders/scene3.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
handle = CreateFile("../src/shaders/scene3.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (handle == INVALID_HANDLE_VALUE) {
MessageBoxA(nullptr, "../src/shaders/scene3.frag", "/scene3.frag", MB_ICONERROR | MB_OK); return 0;
}
Expand All @@ -144,7 +144,7 @@ void intro_init()
shaderScene_3 = glCreateShaderProgramv(GL_FRAGMENT_SHADER, 2, shadersArray);


handle = CreateFile("D:/!!Scene/rw2018/Outside/src/shaders/scene4.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
handle = CreateFile("../src/shaders/scene4.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (handle == INVALID_HANDLE_VALUE) {
MessageBoxA(nullptr, "../src/shaders/scene4.frag", "/scene4.frag", MB_ICONERROR | MB_OK); return 0;
}
Expand All @@ -157,7 +157,7 @@ void intro_init()
shadersArray[1] = buffer;
shaderScene_4 = glCreateShaderProgramv(GL_FRAGMENT_SHADER, 2, shadersArray);

handle = CreateFile("D:/!!Scene/rw2018/Outside/src/shaders/scene5.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
handle = CreateFile("../src/shaders/scene5.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (handle == INVALID_HANDLE_VALUE) {
MessageBoxA(nullptr, "../src/shaders/scene5.frag", "/scene5.frag", MB_ICONERROR | MB_OK); return 0;
}
Expand All @@ -172,7 +172,7 @@ void intro_init()

/// vertex

handle = CreateFile("D:/!!Scene/rw2018/Outside/src/shaders/vertex.vert", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
handle = CreateFile("../src/shaders/vertex.vert", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (handle == INVALID_HANDLE_VALUE) {
MessageBoxA(nullptr, "../src/shaders/vertex.vert", "/vertex.vert", MB_ICONERROR | MB_OK); return 0;
}
Expand All @@ -187,7 +187,7 @@ void intro_init()

/// postproc

handle = CreateFile("D:/!!Scene/rw2018/Outside/src/shaders/post_processing_shader.glsl.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
handle = CreateFile("../src/shaders/post_processing_shader.glsl.frag", GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
if (handle == INVALID_HANDLE_VALUE) {
MessageBoxA(nullptr, "../src/shaders/post_processing_shader.glsl.frag", "/post_processing_shader.glsl.frag", MB_ICONERROR | MB_OK); return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion Outside/src/main_win_deb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void introRestart()
start_time = timeGetTime();
BASS_Init(-1, 44100, 0, 0, NULL);
BASS_Start();
hWav = BASS_StreamCreateFile(false, "D:/!!Scene/rw2018/Outside/clinkster/music.wav", 0, 0, BASS_MP3_SETPOS | BASS_SAMPLE_LOOP);
hWav = BASS_StreamCreateFile(false, "../clinkster/music.wav", 0, 0, BASS_MP3_SETPOS | BASS_SAMPLE_LOOP);
BASS_ChannelPlay(hWav, true);
dwStreamLen = BASS_ChannelGetLength(hWav, BASS_POS_BYTE);
fSecondsTotal = BASS_ChannelBytes2Seconds(hWav, dwStreamLen);
Expand Down
Loading

0 comments on commit cf2cb75

Please sign in to comment.