diff --git a/client/src/aic/aic.ts b/client/src/aic/aic.ts index a28aaa9d..770fd695 100644 --- a/client/src/aic/aic.ts +++ b/client/src/aic/aic.ts @@ -1,8 +1,8 @@ -import { ToggleableFeature } from "../ToggleableFeature"; -import { AICFormation_Azimuth } from "./AICFormation/Azimuth"; -import { AICFormation_Range } from "./AICFormation/Range"; -import { AICFormation_Single } from "./AICFormation/Single"; -import { AICFormationDescriptorSection } from "./AICFormationDescriptorSection"; +import { ToggleableFeature } from "../toggleablefeature"; +import { AICFormation_Azimuth } from "./aicformation/azimuth"; +import { AICFormation_Range } from "./aicformation/range"; +import { AICFormation_Single } from "./aicformation/single"; +import { AICFormationDescriptorSection } from "./aicformationdescriptorsection"; export class AIC extends ToggleableFeature { diff --git a/client/src/aic/AICFormation.ts b/client/src/aic/aicformation.ts similarity index 84% rename from client/src/aic/AICFormation.ts rename to client/src/aic/aicformation.ts index e13d1acc..588f4326 100644 --- a/client/src/aic/AICFormation.ts +++ b/client/src/aic/aicformation.ts @@ -1,6 +1,6 @@ -import { AICFormationContextDataInterface, AICFormationDescriptor } from "./AICFormationDescriptor"; -import { AICFormationDescriptorPhrase } from "./AICFormationDescriptorPhrase"; -import { AICFormationDescriptorSection } from "./AICFormationDescriptorSection"; +import { AICFormationContextDataInterface, AICFormationDescriptor } from "./aicformationdescriptor"; +import { AICFormationDescriptorPhrase } from "./aicformationdescriptorphrase"; +import { AICFormationDescriptorSection } from "./aicformationdescriptorsection"; export interface AICFormationInterface { "icon" : string, diff --git a/client/src/aic/AICFormation/Azimuth.ts b/client/src/aic/aicformation/azimuth.ts similarity index 69% rename from client/src/aic/AICFormation/Azimuth.ts rename to client/src/aic/aicformation/azimuth.ts index 65a9a003..7db676ae 100644 --- a/client/src/aic/AICFormation/Azimuth.ts +++ b/client/src/aic/aicformation/azimuth.ts @@ -1,8 +1,8 @@ -import { AICFormation, AICFormationInterface } from "../AICFormation"; -import { AICFormationContextDataInterface } from "../AICFormationDescriptor"; -import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection"; -import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent"; -import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase"; +import { AICFormation, AICFormationInterface } from "../aicformation"; +import { AICFormationContextDataInterface } from "../aicformationdescriptor"; +import { AICFormationDescriptorSection } from "../aicformationdescriptorsection"; +import { AICFormationDescriptorComponent } from "../aicformationdescriptorcomponent"; +import { AICFormationDescriptorPhrase } from "../aicformationdescriptorphrase"; export class AICFormation_Azimuth extends AICFormation implements AICFormationInterface { diff --git a/client/src/aic/AICFormation/Range.ts b/client/src/aic/aicformation/range.ts similarity index 68% rename from client/src/aic/AICFormation/Range.ts rename to client/src/aic/aicformation/range.ts index 32e48557..08c00cd5 100644 --- a/client/src/aic/AICFormation/Range.ts +++ b/client/src/aic/aicformation/range.ts @@ -1,8 +1,8 @@ -import { AICFormation, AICFormationInterface } from "../AICFormation"; -import { AICFormationContextDataInterface } from "../AICFormationDescriptor"; -import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection"; -import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent"; -import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase"; +import { AICFormation, AICFormationInterface } from "../aicformation"; +import { AICFormationContextDataInterface } from "../aicformationdescriptor"; +import { AICFormationDescriptorSection } from "../aicformationdescriptorsection"; +import { AICFormationDescriptorComponent } from "../aicformationdescriptorcomponent"; +import { AICFormationDescriptorPhrase } from "../aicformationdescriptorphrase"; export class AICFormation_Range extends AICFormation implements AICFormationInterface { diff --git a/client/src/aic/AICFormation/Single.ts b/client/src/aic/aicformation/single.ts similarity index 82% rename from client/src/aic/AICFormation/Single.ts rename to client/src/aic/aicformation/single.ts index dd9a8ae4..09830c40 100644 --- a/client/src/aic/AICFormation/Single.ts +++ b/client/src/aic/aicformation/single.ts @@ -1,5 +1,5 @@ -import { AICFormation, AICFormationInterface } from "../AICFormation"; -import { AICFormationContextDataInterface, AICFormationDescriptor } from "../AICFormationDescriptor"; +import { AICFormation, AICFormationInterface } from "../aicformation"; +import { AICFormationContextDataInterface, AICFormationDescriptor } from "../aicformationdescriptor"; export class AICFormation_Single extends AICFormation implements AICFormationInterface { diff --git a/client/src/aic/AICFormationDescriptor.ts b/client/src/aic/aicformationdescriptor.ts similarity index 66% rename from client/src/aic/AICFormationDescriptor.ts rename to client/src/aic/aicformationdescriptor.ts index 8bc43c54..c7a5a563 100644 --- a/client/src/aic/AICFormationDescriptor.ts +++ b/client/src/aic/aicformationdescriptor.ts @@ -1,9 +1,9 @@ -import { AICFormation } from "./AICFormation"; -import { AICFormationDescriptorSection } from "./AICFormationDescriptorSection"; -import { AICFormationDescriptorSection_Formation } from "./AICFormationDescriptorSection/Formation"; -import { AICFormationDescriptorSection_Unit } from "./AICFormationDescriptorSection/Unit"; -import { AICFormationDescriptorSection_NumGroups } from "./AICFormationDescriptorSection/NumGroups"; -import { AICFormationDescriptorSection_Who } from "./AICFormationDescriptorSection/Who"; +import { AICFormation } from "./aicformation"; +import { AICFormationDescriptorSection } from "./aicformationdescriptorsection"; +import { AICFormationDescriptorSection_Formation } from "./aicformationdescriptorsection/formation"; +import { AICFormationDescriptorSection_Unit } from "./aicformationdescriptorsection/unit"; +import { AICFormationDescriptorSection_NumGroups } from "./aicformationdescriptorsection/numgroups"; +import { AICFormationDescriptorSection_Who } from "./aicformationdescriptorsection/who"; export interface AICFormationContextDataInterface { diff --git a/client/src/aic/AICFormationDescriptorComponent.ts b/client/src/aic/aicformationdescriptorcomponent.ts similarity index 100% rename from client/src/aic/AICFormationDescriptorComponent.ts rename to client/src/aic/aicformationdescriptorcomponent.ts diff --git a/client/src/aic/AICFormationDescriptorComponent/Distance.ts b/client/src/aic/aicformationdescriptorcomponent/distance.ts similarity index 69% rename from client/src/aic/AICFormationDescriptorComponent/Distance.ts rename to client/src/aic/aicformationdescriptorcomponent/distance.ts index fe942ac6..2a3766f3 100644 --- a/client/src/aic/AICFormationDescriptorComponent/Distance.ts +++ b/client/src/aic/aicformationdescriptorcomponent/distance.ts @@ -1,4 +1,4 @@ -import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent"; +import { AICFormationDescriptorComponent } from "../aicformationdescriptorcomponent"; export abstract class AICFormactionDescriptorComponent_Distance extends AICFormationDescriptorComponent { diff --git a/client/src/aic/AICFormationDescriptorComponent/Distance/Range.ts b/client/src/aic/aicformationdescriptorcomponent/distance/range.ts similarity index 77% rename from client/src/aic/AICFormationDescriptorComponent/Distance/Range.ts rename to client/src/aic/aicformationdescriptorcomponent/distance/range.ts index 88a23446..ab8a58d3 100644 --- a/client/src/aic/AICFormationDescriptorComponent/Distance/Range.ts +++ b/client/src/aic/aicformationdescriptorcomponent/distance/range.ts @@ -1,4 +1,4 @@ -import { AICFormactionDescriptorComponent_Distance } from "../Distance"; +import { AICFormactionDescriptorComponent_Distance } from "../distance"; export class AICFormationDescriptorComponent_Distance_Range extends AICFormactionDescriptorComponent_Distance { diff --git a/client/src/aic/AICFormationDescriptorPhrase.ts b/client/src/aic/aicformationdescriptorphrase.ts similarity index 75% rename from client/src/aic/AICFormationDescriptorPhrase.ts rename to client/src/aic/aicformationdescriptorphrase.ts index 8ac473ac..b2a519a0 100644 --- a/client/src/aic/AICFormationDescriptorPhrase.ts +++ b/client/src/aic/aicformationdescriptorphrase.ts @@ -1,6 +1,6 @@ -import { AICFormation } from "./AICFormation"; -import { AICFormationContextDataInterface } from "./AICFormationDescriptor"; -import { AICFormationDescriptorComponent } from "./AICFormationDescriptorComponent"; +import { AICFormation } from "./aicformation"; +import { AICFormationContextDataInterface } from "./aicformationdescriptor"; +import { AICFormationDescriptorComponent } from "./aicformationdescriptorcomponent"; export interface AICFormationDescriptorPhraseInterface { "generate" : CallableFunction, diff --git a/client/src/aic/AICFormationDescriptorSection.ts b/client/src/aic/aicformationdescriptorsection.ts similarity index 76% rename from client/src/aic/AICFormationDescriptorSection.ts rename to client/src/aic/aicformationdescriptorsection.ts index ede57edd..bcd2f3c3 100644 --- a/client/src/aic/AICFormationDescriptorSection.ts +++ b/client/src/aic/aicformationdescriptorsection.ts @@ -1,6 +1,6 @@ -import { AICFormation } from "./AICFormation"; -import { AICFormationContextDataInterface } from "./AICFormationDescriptor"; -import { AICFormationDescriptorPhrase } from "./AICFormationDescriptorPhrase"; +import { AICFormation } from "./aicformation"; +import { AICFormationContextDataInterface } from "./aicformationdescriptor"; +import { AICFormationDescriptorPhrase } from "./aicformationdescriptorphrase"; export interface AICFormationDescriptorSectionInterface { "generate" : CallableFunction, diff --git a/client/src/aic/AICFormationDescriptorSection/Formation.ts b/client/src/aic/aicformationdescriptorsection/formation.ts similarity index 66% rename from client/src/aic/AICFormationDescriptorSection/Formation.ts rename to client/src/aic/aicformationdescriptorsection/formation.ts index 9b742151..c77cb4be 100644 --- a/client/src/aic/AICFormationDescriptorSection/Formation.ts +++ b/client/src/aic/aicformationdescriptorsection/formation.ts @@ -1,8 +1,8 @@ -import { AICFormation } from "../AICFormation"; -import { AICFormationContextDataInterface } from "../AICFormationDescriptor"; -import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection"; -import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent"; -import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase"; +import { AICFormation } from "../aicformation"; +import { AICFormationContextDataInterface } from "../aicformationdescriptor"; +import { AICFormationDescriptorSection } from "../aicformationdescriptorsection"; +import { AICFormationDescriptorComponent } from "../aicformationdescriptorcomponent"; +import { AICFormationDescriptorPhrase } from "../aicformationdescriptorphrase"; export class AICFormationDescriptorSection_Formation extends AICFormationDescriptorSection { diff --git a/client/src/aic/AICFormationDescriptorSection/NumGroups.ts b/client/src/aic/aicformationdescriptorsection/numgroups.ts similarity index 63% rename from client/src/aic/AICFormationDescriptorSection/NumGroups.ts rename to client/src/aic/aicformationdescriptorsection/numgroups.ts index 2714b8f6..81b92a86 100644 --- a/client/src/aic/AICFormationDescriptorSection/NumGroups.ts +++ b/client/src/aic/aicformationdescriptorsection/numgroups.ts @@ -1,8 +1,8 @@ -import { AICFormation } from "../AICFormation"; -import { AICFormationContextDataInterface } from "../AICFormationDescriptor"; -import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection"; -import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent"; -import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase"; +import { AICFormation } from "../aicformation"; +import { AICFormationContextDataInterface } from "../aicformationdescriptor"; +import { AICFormationDescriptorSection } from "../aicformationdescriptorsection"; +import { AICFormationDescriptorComponent } from "../aicformationdescriptorcomponent"; +import { AICFormationDescriptorPhrase } from "../aicformationdescriptorphrase"; export class AICFormationDescriptorSection_NumGroups extends AICFormationDescriptorSection { diff --git a/client/src/aic/AICFormationDescriptorSection/Unit.ts b/client/src/aic/aicformationdescriptorsection/unit.ts similarity index 86% rename from client/src/aic/AICFormationDescriptorSection/Unit.ts rename to client/src/aic/aicformationdescriptorsection/unit.ts index 70743ee9..749fe625 100644 --- a/client/src/aic/AICFormationDescriptorSection/Unit.ts +++ b/client/src/aic/aicformationdescriptorsection/unit.ts @@ -1,8 +1,8 @@ -import { AICFormation } from "../AICFormation"; -import { AICFormationContextDataInterface } from "../AICFormationDescriptor"; -import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection"; -import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent"; -import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase"; +import { AICFormation } from "../aicformation"; +import { AICFormationContextDataInterface } from "../aicformationdescriptor"; +import { AICFormationDescriptorSection } from "../aicformationdescriptorsection"; +import { AICFormationDescriptorComponent } from "../aicformationdescriptorcomponent"; +import { AICFormationDescriptorPhrase } from "../aicformationdescriptorphrase"; interface addUnitInformationInterface { omitTrack?: boolean diff --git a/client/src/aic/AICFormationDescriptorSection/Who.ts b/client/src/aic/aicformationdescriptorsection/who.ts similarity index 64% rename from client/src/aic/AICFormationDescriptorSection/Who.ts rename to client/src/aic/aicformationdescriptorsection/who.ts index 5856c871..244b0558 100644 --- a/client/src/aic/AICFormationDescriptorSection/Who.ts +++ b/client/src/aic/aicformationdescriptorsection/who.ts @@ -1,8 +1,8 @@ -import { AICFormation } from "../AICFormation"; -import { AICFormationContextDataInterface } from "../AICFormationDescriptor"; -import { AICFormationDescriptorSection } from "../AICFormationDescriptorSection"; -import { AICFormationDescriptorComponent } from "../AICFormationDescriptorComponent"; -import { AICFormationDescriptorPhrase } from "../AICFormationDescriptorPhrase"; +import { AICFormation } from "../aicformation"; +import { AICFormationContextDataInterface } from "../aicformationdescriptor"; +import { AICFormationDescriptorSection } from "../aicformationdescriptorsection"; +import { AICFormationDescriptorComponent } from "../aicformationdescriptorcomponent"; +import { AICFormationDescriptorPhrase } from "../aicformationdescriptorphrase"; export class AICFormationDescriptorSection_Who extends AICFormationDescriptorSection { diff --git a/client/src/atc/ATC.ts b/client/src/atc/ATC.ts index c409b02e..14710071 100644 --- a/client/src/atc/ATC.ts +++ b/client/src/atc/ATC.ts @@ -1,6 +1,6 @@ -import { ToggleableFeature } from "../ToggleableFeature"; +import { ToggleableFeature } from "../toggleablefeature"; import Sortable from 'sortablejs'; -import { ATCFLightList } from "./FlightList"; +import { ATCFLightList } from "./flightlist"; export class ATC extends ToggleableFeature { diff --git a/client/src/atc/ATCMockAPI/Flights.ts b/client/src/atc/ATCMockAPI/Flights.ts index b710b016..6d6b6435 100644 --- a/client/src/atc/ATCMockAPI/Flights.ts +++ b/client/src/atc/ATCMockAPI/Flights.ts @@ -1,4 +1,4 @@ -import { ATCMockAPI } from "../ATCMockAPI"; +import { ATCMockAPI } from "../atcmockapi"; export class ATCMockAPI_Flights extends ATCMockAPI { diff --git a/client/src/atc/FlightList.ts b/client/src/atc/FlightList.ts index a24a55e2..36185eef 100644 --- a/client/src/atc/FlightList.ts +++ b/client/src/atc/FlightList.ts @@ -1,4 +1,4 @@ -import { ATCMockAPI_Flights } from "./ATCMockAPI/Flights"; +import { ATCMockAPI_Flights } from "./atcmockapi/flights"; export class ATCFLightList { diff --git a/client/src/atc/atc.ts b/client/src/atc/atc.ts new file mode 100644 index 00000000..14710071 --- /dev/null +++ b/client/src/atc/atc.ts @@ -0,0 +1,87 @@ +import { ToggleableFeature } from "../toggleablefeature"; +import Sortable from 'sortablejs'; +import { ATCFLightList } from "./flightlist"; + +export class ATC extends ToggleableFeature { + + constructor() { + + super( true ); + + //this.#generateFlightList(); + + let $list = document.getElementById( "atc-strip-board-arrivals" ); + + if ( $list instanceof HTMLElement ) { + Sortable.create( $list, { + "handle": ".handle" + }); + } + + } + + + #generateFlightList() { + + const flightList = new ATCFLightList(); + const flights:any = flightList.getFlights( true ); + + const $tbody = document.getElementById( "atc-flight-list-table-body" ); + + if ( $tbody instanceof HTMLElement ) { + + if ( flights.length > 0 ) { + + let flight:any = {}; + + let $button, i; + + for ( [ i, flight ] of flights.entries() ) { + + const $row = document.createElement( "tr" ); + $row.dataset.status = flight.status + + let $td = document.createElement( "td" ); + $td.innerText = flight.name; + $row.appendChild( $td ); + + $td = document.createElement( "td" ); + $td.innerText = flight.takeOffTime; + $row.appendChild( $td ); + + $td = document.createElement( "td" ); + $td.innerText = "00:0" + ( 5 + i ); + $row.appendChild( $td ); + + $td = document.createElement( "td" ); + $td.innerText = flight.status; + $row.appendChild( $td ); + + + $td = document.createElement( "td" ); + $button = document.createElement( "button" ); + $button.innerText = "..."; + + $td.appendChild( $button ); + + $row.appendChild( $td ); + + + $tbody.appendChild( $row ); + + } + + } + + } + + } + + + protected onStatusUpdate(): void { + + document.body.classList.toggle( "atc-enabled", this.getStatus() ); + + } + +} \ No newline at end of file diff --git a/client/src/atc/atcmockapi.ts b/client/src/atc/atcmockapi.ts new file mode 100644 index 00000000..9720e2d0 --- /dev/null +++ b/client/src/atc/atcmockapi.ts @@ -0,0 +1,7 @@ +export abstract class ATCMockAPI { + + constructor() {} + + generateMockData() {} + +} \ No newline at end of file diff --git a/client/src/atc/atcmockapi/flights.ts b/client/src/atc/atcmockapi/flights.ts new file mode 100644 index 00000000..6d6b6435 --- /dev/null +++ b/client/src/atc/atcmockapi/flights.ts @@ -0,0 +1,40 @@ +import { ATCMockAPI } from "../atcmockapi"; + +export class ATCMockAPI_Flights extends ATCMockAPI { + + + generateMockData() { + + let data = []; + const statuses = [ "unknown", "checkedIn", "readyToTaxi" ] + + for ( const [ i, flightName ] of [ "Shark", "Whale", "Dolphin" ].entries() ) { + + data.push({ + "name": flightName, + "status": statuses[ i ], + "takeOffTime": "18:0" + i + }); + + } + + localStorage.setItem( "flightList", JSON.stringify( data ) ); + + } + + + get( generateMockDataIfEmpty?:boolean ) : object { + + generateMockDataIfEmpty = generateMockDataIfEmpty || false; + + let data = localStorage.getItem( "flightList" ) || "[]"; + + if ( data === "[]" && generateMockDataIfEmpty ) { + this.generateMockData(); + } + + return JSON.parse( data ); + + } + +} \ No newline at end of file diff --git a/client/src/atc/flightlist.ts b/client/src/atc/flightlist.ts new file mode 100644 index 00000000..36185eef --- /dev/null +++ b/client/src/atc/flightlist.ts @@ -0,0 +1,18 @@ +import { ATCMockAPI_Flights } from "./atcmockapi/flights"; + +export class ATCFLightList { + + + constructor() { + + + + } + + + getFlights( generateMockDataIfEmpty?:boolean ) { + let api = new ATCMockAPI_Flights(); + return api.get( generateMockDataIfEmpty ); + } + +} \ No newline at end of file diff --git a/client/src/FeatureSwitches.ts b/client/src/featureswitches.ts similarity index 100% rename from client/src/FeatureSwitches.ts rename to client/src/featureswitches.ts diff --git a/client/src/index.ts b/client/src/index.ts index de36e338..f151acf2 100644 --- a/client/src/index.ts +++ b/client/src/index.ts @@ -6,8 +6,8 @@ import { MissionHandler } from "./missionhandler/missionhandler"; import { UnitControlPanel } from "./panels/unitcontrolpanel"; import { MouseInfoPanel } from "./panels/mouseinfopanel"; import { AIC } from "./aic/aic"; -import { ATC } from "./atc/ATC"; -import { FeatureSwitches } from "./FeatureSwitches"; +import { ATC } from "./atc/atc"; +import { FeatureSwitches } from "./featureswitches"; import { LogPanel } from "./panels/logpanel"; import { getAirbases, getBulllseye as getBulllseyes, getMission, getUnits, toggleDemoEnabled } from "./server/server"; import { UnitDataTable } from "./units/unitdatatable"; diff --git a/client/src/ToggleableFeature.ts b/client/src/toggleablefeature.ts similarity index 100% rename from client/src/ToggleableFeature.ts rename to client/src/toggleablefeature.ts diff --git a/installer/DCSOlympus.iss b/installer/olympus.iss similarity index 100% rename from installer/DCSOlympus.iss rename to installer/olympus.iss diff --git a/missions/olympus.miz b/missions/olympus.miz new file mode 100644 index 00000000..eaf4b797 Binary files /dev/null and b/missions/olympus.miz differ diff --git a/src/core/include/Commands.h b/src/core/include/commands.h similarity index 100% rename from src/core/include/Commands.h rename to src/core/include/commands.h diff --git a/src/core/include/Scheduler.h b/src/core/include/scheduler.h similarity index 100% rename from src/core/include/Scheduler.h rename to src/core/include/scheduler.h diff --git a/src/core/include/Unit.h b/src/core/include/unit.h similarity index 100% rename from src/core/include/Unit.h rename to src/core/include/unit.h diff --git a/src/core/src/Commands.cpp b/src/core/src/commands.cpp similarity index 100% rename from src/core/src/Commands.cpp rename to src/core/src/commands.cpp diff --git a/src/core/src/Scheduler.cpp b/src/core/src/scheduler.cpp similarity index 100% rename from src/core/src/Scheduler.cpp rename to src/core/src/scheduler.cpp diff --git a/src/core/src/Unit.cpp b/src/core/src/unit.cpp similarity index 100% rename from src/core/src/Unit.cpp rename to src/core/src/unit.cpp diff --git a/src/olympus.sln b/src/olympus.sln new file mode 100644 index 00000000..bbebd79f --- /dev/null +++ b/src/olympus.sln @@ -0,0 +1,42 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32929.385 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core\core.vcxproj", "{8A48D855-0E01-42BA-BD8C-07B0877C68DF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logger", "logger\logger.vcxproj", "{873ECABE-FCFE-4217-AC15-91959C3CF1C6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dcstools", "dcstools\dcstools.vcxproj", "{2B255368-39A0-431A-A6DE-CC739AC70DC1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luatools", "luatools\luatools.vcxproj", "{DE139EC1-4F88-47D5-BE73-F41915FE14A3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "utils\utils.vcxproj", "{B85009CE-4A5C-4A5A-B85D-001B3A2651B2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "olympus", "olympus\olympus.vcxproj", "{5F3FC91E-1FBC-4223-8011-9708DE913474}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8A48D855-0E01-42BA-BD8C-07B0877C68DF}.Release|x64.ActiveCfg = Release|x64 + {8A48D855-0E01-42BA-BD8C-07B0877C68DF}.Release|x64.Build.0 = Release|x64 + {873ECABE-FCFE-4217-AC15-91959C3CF1C6}.Release|x64.ActiveCfg = Release|x64 + {873ECABE-FCFE-4217-AC15-91959C3CF1C6}.Release|x64.Build.0 = Release|x64 + {2B255368-39A0-431A-A6DE-CC739AC70DC1}.Release|x64.ActiveCfg = Release|x64 + {2B255368-39A0-431A-A6DE-CC739AC70DC1}.Release|x64.Build.0 = Release|x64 + {DE139EC1-4F88-47D5-BE73-F41915FE14A3}.Release|x64.ActiveCfg = Release|x64 + {DE139EC1-4F88-47D5-BE73-F41915FE14A3}.Release|x64.Build.0 = Release|x64 + {B85009CE-4A5C-4A5A-B85D-001B3A2651B2}.Release|x64.ActiveCfg = Release|x64 + {B85009CE-4A5C-4A5A-B85D-001B3A2651B2}.Release|x64.Build.0 = Release|x64 + {5F3FC91E-1FBC-4223-8011-9708DE913474}.Release|x64.ActiveCfg = Release|x64 + {5F3FC91E-1FBC-4223-8011-9708DE913474}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {FAB9F592-7511-4EB9-B365-078842ED9BDD} + EndGlobalSection +EndGlobal diff --git a/src/Olympus/Olympus.filters b/src/olympus/olympus.filters similarity index 100% rename from src/Olympus/Olympus.filters rename to src/olympus/olympus.filters diff --git a/src/Olympus/Olympus.vcxproj b/src/olympus/olympus.vcxproj similarity index 100% rename from src/Olympus/Olympus.vcxproj rename to src/olympus/olympus.vcxproj diff --git a/src/Olympus/Olympus.vcxproj.filters b/src/olympus/olympus.vcxproj.filters similarity index 100% rename from src/Olympus/Olympus.vcxproj.filters rename to src/olympus/olympus.vcxproj.filters diff --git a/src/Olympus/src/olympus.cpp b/src/olympus/src/olympus.cpp similarity index 100% rename from src/Olympus/src/olympus.cpp rename to src/olympus/src/olympus.cpp diff --git a/src/utils/include/Utils.h b/src/utils/include/utils.h similarity index 100% rename from src/utils/include/Utils.h rename to src/utils/include/utils.h diff --git a/src/utils/src/Utils.cpp b/src/utils/src/utils.cpp similarity index 100% rename from src/utils/src/Utils.cpp rename to src/utils/src/utils.cpp