From 7881e40e0b6b88fc20b86eecd1fbb6654b32e52e Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 7 Nov 2018 19:11:01 -0500 Subject: [PATCH] Shuffles the OpenGL primitives into their own collection. --- .../Clock Signal.xcodeproj/project.pbxproj | 52 ++++++++++++------- Outputs/OpenGL/{ => Primitives}/Rectangle.cpp | 0 Outputs/OpenGL/{ => Primitives}/Rectangle.hpp | 2 +- .../OpenGL/{Shaders => Primitives}/Shader.cpp | 0 .../OpenGL/{Shaders => Primitives}/Shader.hpp | 0 .../OpenGL/{ => Primitives}/TextureTarget.cpp | 0 .../OpenGL/{ => Primitives}/TextureTarget.hpp | 2 +- 7 files changed, 34 insertions(+), 22 deletions(-) rename Outputs/OpenGL/{ => Primitives}/Rectangle.cpp (100%) rename Outputs/OpenGL/{ => Primitives}/Rectangle.hpp (96%) rename Outputs/OpenGL/{Shaders => Primitives}/Shader.cpp (100%) rename Outputs/OpenGL/{Shaders => Primitives}/Shader.hpp (100%) rename Outputs/OpenGL/{ => Primitives}/TextureTarget.cpp (100%) rename Outputs/OpenGL/{ => Primitives}/TextureTarget.hpp (98%) diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index d584a56c6..4600e3c2b 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -613,13 +613,15 @@ 4BC9E1EE1D23449A003FCEE4 /* 6502InterruptTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC9E1ED1D23449A003FCEE4 /* 6502InterruptTests.swift */; }; 4BCA6CC81D9DD9F000C2D7B2 /* CommodoreROM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BCA6CC61D9DD9F000C2D7B2 /* CommodoreROM.cpp */; }; 4BCF1FA41DADC3DD0039D2E7 /* Oric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF1FA21DADC3DD0039D2E7 /* Oric.cpp */; }; - 4BD191F0219117F90042E144 /* Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD191E6219113B80042E144 /* Rectangle.cpp */; }; - 4BD191F1219117FA0042E144 /* Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD191E6219113B80042E144 /* Rectangle.cpp */; }; 4BD191F42191180E0042E144 /* ScanTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD191F22191180E0042E144 /* ScanTarget.cpp */; }; 4BD191F52191180E0042E144 /* ScanTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD191F22191180E0042E144 /* ScanTarget.cpp */; }; - 4BD191F6219118390042E144 /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD191E2219113B80042E144 /* Shader.cpp */; }; - 4BD191F72191183A0042E144 /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD191E2219113B80042E144 /* Shader.cpp */; }; 4BD3A30B1EE755C800B5B501 /* Video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD3A3091EE755C800B5B501 /* Video.cpp */; }; + 4BD424DF2193B5340097291A /* TextureTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424DD2193B5340097291A /* TextureTarget.cpp */; }; + 4BD424E02193B5340097291A /* TextureTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424DD2193B5340097291A /* TextureTarget.cpp */; }; + 4BD424E52193B5830097291A /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424E12193B5820097291A /* Shader.cpp */; }; + 4BD424E62193B5830097291A /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424E12193B5820097291A /* Shader.cpp */; }; + 4BD424E72193B5830097291A /* Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424E22193B5820097291A /* Rectangle.cpp */; }; + 4BD424E82193B5830097291A /* Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424E22193B5820097291A /* Rectangle.cpp */; }; 4BD468F71D8DF41D0084958B /* 1770.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD468F51D8DF41D0084958B /* 1770.cpp */; }; 4BD4A8D01E077FD20020D856 /* PCMTrackTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BD4A8CF1E077FD20020D856 /* PCMTrackTests.mm */; }; 4BD5F1951D13528900631CD1 /* CSBestEffortUpdater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BD5F1941D13528900631CD1 /* CSBestEffortUpdater.mm */; }; @@ -1365,24 +1367,24 @@ 4BD191D7219113B80042E144 /* CRTOpenGL.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CRTOpenGL.hpp; sourceTree = ""; }; 4BD191D8219113B80042E144 /* TextureBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureBuilder.cpp; sourceTree = ""; }; 4BD191D9219113B80042E144 /* OpenGL.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = OpenGL.hpp; sourceTree = ""; }; - 4BD191DA219113B80042E144 /* TextureTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureTarget.cpp; sourceTree = ""; }; - 4BD191DB219113B80042E144 /* Rectangle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Rectangle.hpp; sourceTree = ""; }; 4BD191DC219113B80042E144 /* CRTOpenGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CRTOpenGL.cpp; sourceTree = ""; }; 4BD191DD219113B80042E144 /* TextureBuilder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TextureBuilder.hpp; sourceTree = ""; }; - 4BD191DE219113B80042E144 /* TextureTarget.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TextureTarget.hpp; sourceTree = ""; }; 4BD191E0219113B80042E144 /* IntermediateShader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = IntermediateShader.hpp; sourceTree = ""; }; 4BD191E1219113B80042E144 /* OutputShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OutputShader.cpp; sourceTree = ""; }; - 4BD191E2219113B80042E144 /* Shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Shader.cpp; sourceTree = ""; }; 4BD191E3219113B80042E144 /* IntermediateShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntermediateShader.cpp; sourceTree = ""; }; 4BD191E4219113B80042E144 /* OutputShader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = OutputShader.hpp; sourceTree = ""; }; - 4BD191E5219113B80042E144 /* Shader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Shader.hpp; sourceTree = ""; }; - 4BD191E6219113B80042E144 /* Rectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Rectangle.cpp; sourceTree = ""; }; 4BD191E7219113B90042E144 /* ArrayBuilder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ArrayBuilder.hpp; sourceTree = ""; }; 4BD191F22191180E0042E144 /* ScanTarget.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ScanTarget.cpp; sourceTree = ""; }; 4BD191F32191180E0042E144 /* ScanTarget.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ScanTarget.hpp; sourceTree = ""; }; 4BD388411FE34E010042B588 /* 9918Base.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 9918Base.hpp; path = 9918/Implementation/9918Base.hpp; sourceTree = ""; }; 4BD3A3091EE755C800B5B501 /* Video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Video.cpp; path = ZX8081/Video.cpp; sourceTree = ""; }; 4BD3A30A1EE755C800B5B501 /* Video.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Video.hpp; path = ZX8081/Video.hpp; sourceTree = ""; }; + 4BD424DD2193B5340097291A /* TextureTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureTarget.cpp; sourceTree = ""; }; + 4BD424DE2193B5340097291A /* TextureTarget.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TextureTarget.hpp; sourceTree = ""; }; + 4BD424E12193B5820097291A /* Shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Shader.cpp; sourceTree = ""; }; + 4BD424E22193B5820097291A /* Rectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Rectangle.cpp; sourceTree = ""; }; + 4BD424E32193B5830097291A /* Rectangle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Rectangle.hpp; sourceTree = ""; }; + 4BD424E42193B5830097291A /* Shader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Shader.hpp; sourceTree = ""; }; 4BD468F51D8DF41D0084958B /* 1770.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 1770.cpp; path = 1770/1770.cpp; sourceTree = ""; }; 4BD468F61D8DF41D0084958B /* 1770.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = 1770.hpp; path = 1770/1770.hpp; sourceTree = ""; }; 4BD4A8CF1E077FD20020D856 /* PCMTrackTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PCMTrackTests.mm; sourceTree = ""; }; @@ -3025,17 +3027,14 @@ children = ( 4BD191D6219113B80042E144 /* ArrayBuilder.cpp */, 4BD191DC219113B80042E144 /* CRTOpenGL.cpp */, - 4BD191E6219113B80042E144 /* Rectangle.cpp */, 4BD191F22191180E0042E144 /* ScanTarget.cpp */, 4BD191D8219113B80042E144 /* TextureBuilder.cpp */, - 4BD191DA219113B80042E144 /* TextureTarget.cpp */, 4BD191E7219113B90042E144 /* ArrayBuilder.hpp */, 4BD191D7219113B80042E144 /* CRTOpenGL.hpp */, 4BD191D9219113B80042E144 /* OpenGL.hpp */, - 4BD191DB219113B80042E144 /* Rectangle.hpp */, 4BD191F32191180E0042E144 /* ScanTarget.hpp */, 4BD191DD219113B80042E144 /* TextureBuilder.hpp */, - 4BD191DE219113B80042E144 /* TextureTarget.hpp */, + 4BD424DC2193B5340097291A /* Primitives */, 4BD191DF219113B80042E144 /* Shaders */, ); name = OpenGL; @@ -3047,10 +3046,8 @@ children = ( 4BD191E3219113B80042E144 /* IntermediateShader.cpp */, 4BD191E1219113B80042E144 /* OutputShader.cpp */, - 4BD191E2219113B80042E144 /* Shader.cpp */, 4BD191E0219113B80042E144 /* IntermediateShader.hpp */, 4BD191E4219113B80042E144 /* OutputShader.hpp */, - 4BD191E5219113B80042E144 /* Shader.hpp */, ); path = Shaders; sourceTree = ""; @@ -3063,6 +3060,19 @@ name = Implementation; sourceTree = ""; }; + 4BD424DC2193B5340097291A /* Primitives */ = { + isa = PBXGroup; + children = ( + 4BD424E22193B5820097291A /* Rectangle.cpp */, + 4BD424E12193B5820097291A /* Shader.cpp */, + 4BD424DD2193B5340097291A /* TextureTarget.cpp */, + 4BD424E32193B5830097291A /* Rectangle.hpp */, + 4BD424E42193B5830097291A /* Shader.hpp */, + 4BD424DE2193B5340097291A /* TextureTarget.hpp */, + ); + path = Primitives; + sourceTree = ""; + }; 4BD468F81D8DF4290084958B /* 1770 */ = { isa = PBXGroup; children = ( @@ -3695,11 +3705,10 @@ 4B89451B201967B4007DE474 /* ConfidenceSummary.cpp in Sources */, 4B1B88C1202E3DB200B67DFF /* MultiConfigurable.cpp in Sources */, 4B055AA31FAE85DF0060FFFF /* ImplicitSectors.cpp in Sources */, - 4BD191F1219117FA0042E144 /* Rectangle.cpp in Sources */, 4B055AAE1FAE85FD0060FFFF /* TrackSerialiser.cpp in Sources */, 4B89452B201967B4007DE474 /* File.cpp in Sources */, - 4BD191F6219118390042E144 /* Shader.cpp in Sources */, 4B055A981FAE85C50060FFFF /* Drive.cpp in Sources */, + 4BD424E62193B5830097291A /* Shader.cpp in Sources */, 4B4B1A3D200198CA00A0F866 /* KonamiSCC.cpp in Sources */, 4B055AC31FAE9AE80060FFFF /* AmstradCPC.cpp in Sources */, 4B055A9E1FAE85DA0060FFFF /* G64.cpp in Sources */, @@ -3766,11 +3775,13 @@ 4B055ACD1FAE9B030060FFFF /* Keyboard.cpp in Sources */, 4B055AB21FAE860F0060FFFF /* CommodoreTAP.cpp in Sources */, 4B055ADF1FAE9B4C0060FFFF /* IRQDelegatePortHandler.cpp in Sources */, + 4BD424E02193B5340097291A /* TextureTarget.cpp in Sources */, 4B055AB51FAE860F0060FFFF /* TapePRG.cpp in Sources */, 4B055AE01FAE9B660060FFFF /* CRT.cpp in Sources */, 4B894527201967B4007DE474 /* StaticAnalyser.cpp in Sources */, 4BAF2B4F2004580C00480230 /* DMK.cpp in Sources */, 4B055AD01FAE9B030060FFFF /* Tape.cpp in Sources */, + 4BD424E82193B5830097291A /* Rectangle.cpp in Sources */, 4B055A961FAE85BB0060FFFF /* Commodore.cpp in Sources */, 4B0333B02094081A0050B93D /* AppleDSK.cpp in Sources */, 4B055ADE1FAE9B4C0060FFFF /* 6522Base.cpp in Sources */, @@ -3820,6 +3831,7 @@ 4B448E841F1C4C480009ABD6 /* PulseQueuedTape.cpp in Sources */, 4B0E61071FF34737002A9DBD /* MSX.cpp in Sources */, 4B4518A01F75FD1C00926311 /* CPCDSK.cpp in Sources */, + 4BD424DF2193B5340097291A /* TextureTarget.cpp in Sources */, 4B0CCC451C62D0B3001CAC5F /* CRT.cpp in Sources */, 4B322E041F5A2E3C004EB04C /* Z80Base.cpp in Sources */, 4B894530201967B4007DE474 /* StaticAnalyser.cpp in Sources */, @@ -3847,14 +3859,13 @@ 4B4DC82B1D2C27A4003C5BF8 /* SerialBus.cpp in Sources */, 4BBFFEE61F7B27F1005F3FEB /* TrackSerialiser.cpp in Sources */, 4BAE49582032881E004BE78E /* CSZX8081.mm in Sources */, + 4BD424E52193B5830097291A /* Shader.cpp in Sources */, 4B0333AF2094081A0050B93D /* AppleDSK.cpp in Sources */, - 4BD191F72191183A0042E144 /* Shader.cpp in Sources */, 4B894518201967B4007DE474 /* ConfidenceCounter.cpp in Sources */, 4B89452E201967B4007DE474 /* StaticAnalyser.cpp in Sources */, 4B38F3481F2EC11D00D9235D /* AmstradCPC.cpp in Sources */, 4B8FE2221DA19FB20090D3CE /* MachinePanel.swift in Sources */, 4B4518A41F75FD1C00926311 /* OricMFMDSK.cpp in Sources */, - 4BD191F0219117F90042E144 /* Rectangle.cpp in Sources */, 4B4B1A3C200198CA00A0F866 /* KonamiSCC.cpp in Sources */, 4BB0A65B2044FD3000FB3688 /* SN76489.cpp in Sources */, 4BD5F1951D13528900631CD1 /* CSBestEffortUpdater.mm in Sources */, @@ -3964,6 +3975,7 @@ 4B89453E201967B4007DE474 /* StaticAnalyser.cpp in Sources */, 4B37EE821D7345A6006A09A4 /* BinaryDump.cpp in Sources */, 4B8334821F5D9FF70097E338 /* PartialMachineCycle.cpp in Sources */, + 4BD424E72193B5830097291A /* Rectangle.cpp in Sources */, 4B1B88C0202E3DB200B67DFF /* MultiConfigurable.cpp in Sources */, 4B54C0BC1F8D8E790050900F /* KeyboardMachine.cpp in Sources */, 4BB73EA21B587A5100552FC2 /* AppDelegate.swift in Sources */, diff --git a/Outputs/OpenGL/Rectangle.cpp b/Outputs/OpenGL/Primitives/Rectangle.cpp similarity index 100% rename from Outputs/OpenGL/Rectangle.cpp rename to Outputs/OpenGL/Primitives/Rectangle.cpp diff --git a/Outputs/OpenGL/Rectangle.hpp b/Outputs/OpenGL/Primitives/Rectangle.hpp similarity index 96% rename from Outputs/OpenGL/Rectangle.hpp rename to Outputs/OpenGL/Primitives/Rectangle.hpp index b98e9a4df..07a5152d5 100644 --- a/Outputs/OpenGL/Rectangle.hpp +++ b/Outputs/OpenGL/Primitives/Rectangle.hpp @@ -10,7 +10,7 @@ #define Rectangle_hpp #include "OpenGL.hpp" -#include "Shaders/Shader.hpp" +#include "Shader.hpp" #include namespace OpenGL { diff --git a/Outputs/OpenGL/Shaders/Shader.cpp b/Outputs/OpenGL/Primitives/Shader.cpp similarity index 100% rename from Outputs/OpenGL/Shaders/Shader.cpp rename to Outputs/OpenGL/Primitives/Shader.cpp diff --git a/Outputs/OpenGL/Shaders/Shader.hpp b/Outputs/OpenGL/Primitives/Shader.hpp similarity index 100% rename from Outputs/OpenGL/Shaders/Shader.hpp rename to Outputs/OpenGL/Primitives/Shader.hpp diff --git a/Outputs/OpenGL/TextureTarget.cpp b/Outputs/OpenGL/Primitives/TextureTarget.cpp similarity index 100% rename from Outputs/OpenGL/TextureTarget.cpp rename to Outputs/OpenGL/Primitives/TextureTarget.cpp diff --git a/Outputs/OpenGL/TextureTarget.hpp b/Outputs/OpenGL/Primitives/TextureTarget.hpp similarity index 98% rename from Outputs/OpenGL/TextureTarget.hpp rename to Outputs/OpenGL/Primitives/TextureTarget.hpp index 8d05dd1bc..c6b9b14f5 100644 --- a/Outputs/OpenGL/TextureTarget.hpp +++ b/Outputs/OpenGL/Primitives/TextureTarget.hpp @@ -10,7 +10,7 @@ #define TextureTarget_hpp #include "OpenGL.hpp" -#include "Shaders/Shader.hpp" +#include "Shader.hpp" #include namespace OpenGL {