Skip to content

Commit c026402

Browse files
coinbumpcoinbump
committed
Lots of cleanup
1 parent 0daa146 commit c026402

File tree

337 files changed

+3320
-2447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

337 files changed

+3320
-2447
lines changed

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Core/KaijuImGuiRenderProcessor.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@ void KaijuImGuiRenderProcessor::BuildPainters() {
3737
GUARD(world)
3838

3939
windowPainter = NEW<ImGuiWindowPainter>("Kaiju", &isToolActive);
40-
UP<SomeImGuiPainter> worldInfoPainter = NEW<EditorImGuiWorldInfoPainter>(*world);
41-
UP<SomeImGuiPainter> menuBarPainter = NEW<ImGuiMainMenuBarPainter>(editorSystem.menus);
40+
UP<ImGuiPainter> worldInfoPainter = NEW<EditorImGuiWorldInfoPainter>(*world);
41+
UP<ImGuiPainter> menuBarPainter = NEW<ImGuiMainMenuBarPainter>(editorSystem.menus);
4242

43-
UP<SomeImGuiPainter> scrollingPainter = NEW<ImGuiChildPainter>("Scrolling");
43+
UP<ImGuiPainter> scrollingPainter = NEW<ImGuiChildPainter>("Scrolling");
4444

45-
UP<SomeImGuiPainter> scenesPainter =
45+
UP<ImGuiPainter> scenesPainter =
4646
NEW<EditorImGuiScenesPainter>(editorSystem, EditorImGuiScenesPainter::OnSceneSwitchFunc());
4747

48-
UP<SomeImGuiPainter> prefabsPainter = NEW<EditorImGuiPrefabsPainter>(editorSystem);
49-
UP<SomeImGuiPainter> resourcesPainter = NEW<EditorImGuiResourcesPainter>(editorSystem);
50-
UP<SomeImGuiPainter> sceneTreePainter = NEW<EditorImGuiSceneTreePainter>(
48+
UP<ImGuiPainter> prefabsPainter = NEW<EditorImGuiPrefabsPainter>(editorSystem);
49+
UP<ImGuiPainter> resourcesPainter = NEW<EditorImGuiResourcesPainter>(editorSystem);
50+
UP<ImGuiPainter> sceneTreePainter = NEW<EditorImGuiSceneTreePainter>(
5151
editorSystem, EditorImGuiSceneTreePainter::OnInspectFunc()
5252
);
53-
UP<SomeImGuiPainter> renderEnginePainter = NEW<EditorImGuiRenderEnginePainter>(editorSystem);
54-
UP<SomeImGuiPainter> commandHistoryPainter =
53+
UP<ImGuiPainter> renderEnginePainter = NEW<EditorImGuiRenderEnginePainter>(editorSystem);
54+
UP<ImGuiPainter> commandHistoryPainter =
5555
NEW<EditorImGuiCommandHistoryPainter>(editorSystem.commands);
5656

5757
scrollingPainter->tree.Add(scenesPainter);

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Core/KaijuImGuiRenderProcessor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class KaijuImGuiRenderProcessor : public RenderProcessor {
1818
SceneClassRegistry sceneClasses;
1919
bool isWindowConfigured = false;
2020
bool isToolActive = false;
21-
UP<SomeImGuiPainter> windowPainter;
21+
UP<ImGuiPainter> windowPainter;
2222

2323
KaijuImGuiRenderProcessor(KaijuWorldSystem& editorSystem) :
2424
Base({ .phases = { RenderPhaseId::RenderPassStartPost } }),

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Core/KaijuWorldSystem.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ KaijuWorldSystem::KaijuWorldSystem() {
2828
// auto menuItem = MAKE<MenuItem>("Hello", VectorList<KeyboardShortcut>{{"c",
2929
// {EventModifier::Shift, EventModifier::Control}}, {"A", {EventModifier::OptionAlt}}},
3030
// [](auto& menuItem) { std::cout << "Hello" << std::endl; }); menuItem->isToggleOn = true;
31-
typeTags.insert(EditorTypeTag::Persist);
31+
AddTypeTag(EditorTypeTag::Persist);
3232

3333
auto undoMenuItem = NEW<MenuItem>(
3434
"Undo", VectorList<KeyboardShortcut>{ { "z", { KeyModifier::Shortcut } } },
@@ -130,9 +130,9 @@ void KaijuWorldSystem::ProcessUIEvents(UIEventList const& uiEvents) {
130130
for (auto& event : uiEvents) {
131131
auto keyDownEvent = DCAST<KeyDownUIEvent>(event);
132132
if (keyDownEvent) {
133-
switch (keyDownEvent->keyCode.value) {
133+
switch (keyDownEvent->KeyCodeValue()) {
134134
case SDLK_TAB:
135-
if (keyDownEvent->keyModifiers.Contains(KeyModifier::Control)) {
135+
if (keyDownEvent->core.keyModifiers.Contains(KeyModifier::Control)) {
136136
isUIVisible = !isUIVisible;
137137
}
138138
break;

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Examples/Checkers Example/ExampleCheckersBoardView.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ void BoardView::Build() {
3232
qb.And("Drop node")
3333
.With<MatrixPieceHandler>(MatrixPieceHandler::Config{ .origin = loc,
3434
.shapeString = "*" })
35-
.With<SomeDropTarget>()
35+
.With<DropTarget>()
3636
.SquareCollider(CellSize().x)
3737
.SquareFrame(CellSize().x, Color::white, 2)
38-
.ModifyLatest<SomeDropTarget>([=](SomeDropTarget& target) {
39-
SomeRenderer* renderer = target.owner->TypeComponent<SomeRenderer>();
38+
.ModifyLatest<DropTarget>([=](DropTarget& target) {
39+
Renderer* renderer = target.owner->TypeComponent<Renderer>();
4040
GUARD(renderer)
4141

42-
target.canAcceptDragFunc = [=](SomeDropTarget& target, auto& dragModel) {
42+
target.canAcceptDragFunc = [=](DropTarget& target, auto& dragModel) {
4343
return !piecesView->board.IsCellOccupied(loc);
4444
};
4545

46-
target.onStateChangeFunc = [=](SomeDropTarget& target) {
47-
renderer->Enable(target.State() == SomeDropTarget::StateType::DragAccept);
46+
target.onStateChangeFunc = [=](DropTarget& target) {
47+
renderer->Enable(target.State() == DropTarget::StateType::DragAccept);
4848
};
4949

50-
target.onDropFunc = [=](SomeDropTarget& target, DragModel const& dragModel) {
50+
target.onDropFunc = [=](DropTarget& target, DragModel const& dragModel) {
5151
GUARD(dragModel.DragHandler())
5252

5353
auto pieceHandler =

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Examples/Checkers Example/ExampleCheckersMatrixRenderer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
namespace Example {
66
namespace Checkers {
77
/// Renders the 8x8 checkboard with a mesh
8-
class MatrixRenderer : public SomeMaterialRenderer {
8+
class MatrixRenderer : public MaterialRenderer {
99
public:
10-
using Base = SomeMaterialRenderer;
10+
using Base = MaterialRenderer;
1111

1212
public:
1313
MatrixRenderer(Vector3 worldSize);

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Examples/Checkers Example/ExampleCheckersPiecesView.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void PiecesView::Build() {
3737
.With<MatrixPieceHandler>(MatrixPieceHandler::Config{ .origin = loc,
3838
.shapeString = "*" })
3939
.ModifyLatest<MatrixPieceHandler>([](auto& handler) {
40-
handler.core.typeTags.insert("black");
40+
handler._core.typeTags.insert("black");
4141
})
4242
.SetValveDurations(0.45f, 0.45f)
4343
.HoverScaleToPingPong(1.15f)
@@ -64,7 +64,7 @@ void PiecesView::Build() {
6464
.With<MatrixPieceHandler>(MatrixPieceHandler::Config{ .origin = loc,
6565
.shapeString = "*" })
6666
.ModifyLatest<MatrixPieceHandler>([](auto& handler) {
67-
handler.core.typeTags.insert("red");
67+
handler._core.typeTags.insert("red");
6868
})
6969
.SetValveDurations(0.45f, 0.45f)
7070
.HoverScaleToPingPong(1.15f)
@@ -102,7 +102,7 @@ void PiecesView::TryMove(MatrixPieceHandler& pieceHandler, Vec2I location) {
102102
RemoveAt(jumpedLocation, DestroyType::Keep);
103103

104104
jumpedPieceNode.RemoveType<DragHandler2D>();
105-
jumpedPieceNode.RemoveType<SomeCollider>();
105+
jumpedPieceNode.RemoveType<Collider>();
106106

107107
QB(jumpedPieceNode)
108108
.SetAnimateDuration(0.2f)
@@ -119,7 +119,7 @@ bool PiecesView::CanMove(MatrixPieceHandler& pieceHandler, Vec2I location) {
119119
GUARDR(!board.IsCellOccupied(location), false)
120120

121121
auto pieceLocation = pieceHandler.piece->Origin();
122-
auto isBlack = pieceHandler.core.typeTags.contains("black");
122+
auto isBlack = pieceHandler._core.typeTags.contains("black");
123123

124124
if (isBlack) {
125125
// Ok to move 1 diagonal.
@@ -137,7 +137,7 @@ bool PiecesView::CanMove(MatrixPieceHandler& pieceHandler, Vec2I location) {
137137
auto& jumpedPieceNode = NodeAt(jumpedLocation);
138138
auto jumpedPieceComponent = jumpedPieceNode.TypeComponent<MatrixPieceHandler>();
139139
if (jumpedPieceComponent &&
140-
jumpedPieceComponent->core.typeTags.contains("black") != isBlack) {
140+
jumpedPieceComponent->_core.typeTags.contains("black") != isBlack) {
141141
return true;
142142
}
143143
} catch (...) {}
@@ -157,7 +157,7 @@ bool PiecesView::CanMove(MatrixPieceHandler& pieceHandler, Vec2I location) {
157157
auto& jumpedPieceNode = NodeAt(jumpedLocation);
158158
auto jumpedPieceComponent = jumpedPieceNode.TypeComponent<MatrixPieceHandler>();
159159
if (jumpedPieceComponent &&
160-
jumpedPieceComponent->core.typeTags.contains("black") != isBlack) {
160+
jumpedPieceComponent->_core.typeTags.contains("black") != isBlack) {
161161
return true;
162162
}
163163
} catch (...) {}

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Examples/Life Example/ExampleLifeAgentGroup.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace Example {
1010
class MatrixRenderer;
1111

1212
/// Agent group for the life simulation
13-
class AgentGroup : public PJ::AgentGroup<Agent> {
13+
class AgentGroup : public PJ::TypeAgentGroup<Agent> {
1414
public:
15-
using Base = PJ::AgentGroup<Agent>;
15+
using Base = PJ::TypeAgentGroup<Agent>;
1616

1717
/// Matrix owner of the agent group
1818
MatrixRenderer* matrixView{};

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Examples/Life Example/ExampleLifeMatrixRenderer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace Example {
1010
class AgentGroup;
1111

1212
/// Runs the simulation and renders it
13-
class MatrixRenderer : public SomeMaterialRenderer {
13+
class MatrixRenderer : public MaterialRenderer {
1414
public:
15-
using Base = SomeMaterialRenderer;
15+
using Base = MaterialRenderer;
1616

1717
AgentSystem system;
1818
SP<AgentGroup> group;

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Examples/Minesweeper Example/ExampleMineSweeperScene.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ void Minesweeper::Scene::LoadInto(WorldNode& root) {
145145
{ .id = SignalId::PointerDown,
146146
.func =
147147
[this](auto& component, auto& event) {
148-
auto screenPos = event.screenPos;
148+
auto screenPos = event.core.screenPos;
149149
auto localPos = ScreenToLocal(*boardView, screenPos);
150150
auto loc = boardView->LocalPositionToLocation(localPos);
151151
GUARD(loc)
152152

153153
auto piece = boardView->board.GetPiece(*loc);
154154
GUARD(piece)
155155

156-
if (PointerInputButton::Left == event.button) {
156+
if (PointerInputButton::Left == event.core.button) {
157157
switch (state) {
158158
case StateType::Running:
159159
if (piece->typeTags.contains("bomb")) {

‎Kaiju/Xcode/Kaiju/Kaiju/Classes/Test Scenes/TestAnimateApp.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ using namespace PJ;
77
class TestAnimateApp : public Scene {
88
public:
99
using Base = Scene;
10-
using TextureList = VectorList<SP<SomeTexture>>;
10+
using TextureList = VectorList<SP<Texture>>;
1111

1212
TextureList textures;
1313

@@ -29,13 +29,13 @@ class TestAnimateApp : public Scene {
2929
GUARD_CONTINUE(successValue)
3030
GUARD_CONTINUE(!IsEmpty(successValue->resources))
3131

32-
auto texture = DCAST<SomeTexture>(successValue->resources[0].resource);
32+
auto texture = DCAST<Texture>(successValue->resources[0].resource);
3333
GUARD_CONTINUE(texture)
3434

3535
textures.push_back(texture);
3636
}
3737

38-
QB(*args.component.owner)
38+
QB(*args.component.Node())
3939
.And("Animation")
4040
.With<AnimatedTextureRenderer>(textures)
4141
.Drag();

0 commit comments

Comments
 (0)