Skip to content

Commit

Permalink
Move Reactive library to experimental directory
Browse files Browse the repository at this point in the history
  • Loading branch information
mogemimi committed Sep 28, 2019
1 parent b66c90f commit ab46ac0
Show file tree
Hide file tree
Showing 25 changed files with 81 additions and 87 deletions.
2 changes: 1 addition & 1 deletion build/pomdog.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1683,6 +1683,7 @@
D7334E02228AEB6A00232225 /* ImageEffects */,
A94F2DC12131FE9E00718DB0 /* MagicaVoxel */,
D7334E38228C68AA00232225 /* Particle2D */,
A93CA62D1D92F2C600B65171 /* Reactive */,
A9A822801DAB7F510091497F /* TexturePacker */,
A94F2DC52131FEAD00718DB0 /* Tween */,
);
Expand Down Expand Up @@ -2142,7 +2143,6 @@
754359D56BFF683A4820D9B3 /* Math */,
D702F02822FD8A5A00886A78 /* Network */,
8C552D14A0990FBC52A70E1A /* Platform/Cocoa */,
A93CA62D1D92F2C600B65171 /* Reactive */,
AAF4E64073F0BBFB4C0B0C43 /* Signals */,
1162BA3AAF5D947C4B6DC236 /* Utility */,
299E154450003A82B25B751A /* Pomdog.hpp */,
Expand Down
46 changes: 23 additions & 23 deletions build/pomdog/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ source_group(Network REGULAR_EXPRESSION "(include/Pomdog|sr
source_group(Platform.Cocoa REGULAR_EXPRESSION "(include/Pomdog/Platform/Cocoa|src/Platform.Cocoa)/*")
source_group(Platform.Win32 REGULAR_EXPRESSION "(include/Pomdog/Platform/Win32|src/Platform.Win32)/*")
source_group(Platform.X11 REGULAR_EXPRESSION "(include/Pomdog/Platform/X11|src/Platform.X11)/*")
source_group(Reactive REGULAR_EXPRESSION "(include/Pomdog|src)/Reactive/*")
source_group(Signals REGULAR_EXPRESSION "(include/Pomdog|src)/Signals/*")
source_group(Utility REGULAR_EXPRESSION "(include/Pomdog|src)/Utility/*")
source_group(Experimental\\Graphics REGULAR_EXPRESSION "(include/Pomdog|src)/Experimental/Graphics/*")
source_group(Experimental\\ImageEffects REGULAR_EXPRESSION "(include/Pomdog|src)/Experimental/ImageEffects/*")
source_group(Experimental\\Image REGULAR_EXPRESSION "(include/Pomdog|src)/Experimental/Image/*")
source_group(Experimental\\MagicaVoxel REGULAR_EXPRESSION "(include/Pomdog|src)/Experimental/MagicaVoxel/*")
source_group(Experimental\\Particle2D REGULAR_EXPRESSION "(include/Pomdog|src)/Experimental/Particle2D/*")
source_group(Experimental\\Reactive REGULAR_EXPRESSION "(include/Pomdog|src)/Experimental/Reactive/*")
source_group(Experimental\\TexturePacker REGULAR_EXPRESSION "(include/Pomdog|src)/Experimental/TexturePacker/*")
source_group(Experimental\\Tween REGULAR_EXPRESSION "(include/Pomdog|src)/Experimental/Tween/*")
source_group(InputSystem REGULAR_EXPRESSION src/InputSystem/*)
Expand Down Expand Up @@ -214,28 +214,6 @@ set(POMDOG_SOURCES_CORE
${POMDOG_DIR}/include/Pomdog/Network/TLSStream.hpp
${POMDOG_DIR}/include/Pomdog/Network/UDPStream.hpp
${POMDOG_DIR}/include/Pomdog/Network/detail/ForwardDeclarations.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Observable.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/ObservableBase.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/ObservableBuilder.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Observer.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Subscriber.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/BufferOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/DebounceOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/DelayOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/DistinctOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/DoOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/FilterOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/FirstOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/LastOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/MapOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/MergeOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/ScanOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/SkipLastOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/SkipOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/TakeOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/TimeoutOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Operators/ZipOperator.hpp
${POMDOG_DIR}/include/Pomdog/Reactive/Subjects/KeyDownSubject.hpp
${POMDOG_DIR}/include/Pomdog/Signals/Connection.hpp
${POMDOG_DIR}/include/Pomdog/Signals/ConnectionList.hpp
${POMDOG_DIR}/include/Pomdog/Signals/Delegate.hpp
Expand Down Expand Up @@ -432,6 +410,28 @@ set(POMDOG_SOURCES_EXPERIMENTAL
${POMDOG_DIR}/include/Pomdog/Experimental/Particle2D/detail/ParticleParameterCurve.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Particle2D/detail/ParticleParameterRandom.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Particle2D/detail/ParticleParameterRandomCurves.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Observable.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/ObservableBase.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/ObservableBuilder.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Observer.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Subscriber.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/BufferOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/DebounceOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/DelayOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/DistinctOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/DoOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/FilterOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/FirstOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/LastOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/MapOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/MergeOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/ScanOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/SkipLastOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/SkipOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/TakeOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/TimeoutOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Operators/ZipOperator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/Reactive/Subjects/KeyDownSubject.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/TexturePacker/TextureAtlas.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/TexturePacker/TextureAtlasGenerator.hpp
${POMDOG_DIR}/include/Pomdog/Experimental/TexturePacker/TextureAtlasLoader.hpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#pragma once

#include "Pomdog/Reactive/ObservableBase.hpp"
#include "Pomdog/Experimental/Reactive/ObservableBase.hpp"
#include <memory>

namespace Pomdog::Reactive {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
#pragma once

#include "Pomdog/Application/GameHost.hpp"
#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/ObservableBase.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Reactive/Operators/BufferOperator.hpp"
#include "Pomdog/Reactive/Operators/DebounceOperator.hpp"
#include "Pomdog/Reactive/Operators/DelayOperator.hpp"
#include "Pomdog/Reactive/Operators/DistinctOperator.hpp"
#include "Pomdog/Reactive/Operators/DoOperator.hpp"
#include "Pomdog/Reactive/Operators/FilterOperator.hpp"
#include "Pomdog/Reactive/Operators/FirstOperator.hpp"
#include "Pomdog/Reactive/Operators/LastOperator.hpp"
#include "Pomdog/Reactive/Operators/MapOperator.hpp"
#include "Pomdog/Reactive/Operators/MergeOperator.hpp"
#include "Pomdog/Reactive/Operators/ScanOperator.hpp"
#include "Pomdog/Reactive/Operators/SkipLastOperator.hpp"
#include "Pomdog/Reactive/Operators/SkipOperator.hpp"
#include "Pomdog/Reactive/Operators/TakeOperator.hpp"
#include "Pomdog/Reactive/Operators/TimeoutOperator.hpp"
#include "Pomdog/Reactive/Operators/ZipOperator.hpp"
#include "Pomdog/Reactive/Subscriber.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/ObservableBase.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Operators/BufferOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/DebounceOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/DelayOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/DistinctOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/DoOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/FilterOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/FirstOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/LastOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/MapOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/MergeOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/ScanOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/SkipLastOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/SkipOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/TakeOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/TimeoutOperator.hpp"
#include "Pomdog/Experimental/Reactive/Operators/ZipOperator.hpp"
#include "Pomdog/Experimental/Reactive/Subscriber.hpp"
#include <functional>
#include <memory>

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "Pomdog/Application/GameClock.hpp"
#include "Pomdog/Application/GameHost.hpp"
#include "Pomdog/Application/Timer.hpp"
#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Signals/ScopedConnection.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "Pomdog/Application/Duration.hpp"
#include "Pomdog/Application/GameClock.hpp"
#include "Pomdog/Application/GameHost.hpp"
#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Signals/ScopedConnection.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "Pomdog/Application/GameClock.hpp"
#include "Pomdog/Application/GameHost.hpp"
#include "Pomdog/Application/Timer.hpp"
#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Signals/ScopedConnection.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#pragma once

#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Reactive/Subscriber.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Subscriber.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <deque>
#include <functional>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "Pomdog/Application/GameClock.hpp"
#include "Pomdog/Application/GameHost.hpp"
#include "Pomdog/Input/Keyboard.hpp"
#include "Pomdog/Reactive/Observable.hpp"
#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observable.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Signals/ScopedConnection.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#pragma once

#include "Pomdog/Reactive/Observer.hpp"
#include "Pomdog/Experimental/Reactive/Observer.hpp"
#include "Pomdog/Utility/Assert.hpp"
#include <functional>
#include <memory>
Expand Down
6 changes: 0 additions & 6 deletions include/Pomdog/Pomdog.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,6 @@ namespace Pomdog {
#include "Input/TouchLocation.hpp"
#include "Input/TouchLocationState.hpp"

#include "Reactive/Observable.hpp"
#include "Reactive/ObservableBase.hpp"
#include "Reactive/ObservableBuilder.hpp"
#include "Reactive/Observer.hpp"
#include "Reactive/Subscriber.hpp"

#include "Signals/Connection.hpp"
#include "Signals/ConnectionList.hpp"
#include "Signals/Delegate.hpp"
Expand Down

0 comments on commit ab46ac0

Please sign in to comment.