Merge pull request #44 from sknjpn/develop

sknjpn · web-flow · commit 2e85a8595cac · 2020-01-23T19:23:28.000+09:00
Develop
diff --git a/App/resources/assets/parts/Big_Nucleus.json b/App/resources/assets/parts/Big_Nucleus.json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Nucleus",
   "name": "Big_Nucleus",
+  "nameJP": "大きな核",
   "mass": 40.0,
   "layers": [
     {
diff --git a/App/resources/assets/parts/Big_Wing(left).json b/App/resources/assets/parts/Big_Wing(left).json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Wing",
   "name": "Big_Wing(left)",
+  "nameJP": "大きな羽(左)",
   "mass": 40.0,
   "layers": [
     {
diff --git a/App/resources/assets/parts/Big_Wing(right).json b/App/resources/assets/parts/Big_Wing(right).json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Wing",
   "name": "Big_Wing(right)",
+  "nameJP": "大きな羽(右)",
   "mass": 40.0,
   "layers": [
     {
@@ -40,5 +41,5 @@
     ]
   },
   "isRight": true,
-  "strength": 10000,
+  "strength": 10000
 }
diff --git a/App/resources/assets/parts/Carbonase.json b/App/resources/assets/parts/Carbonase.json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Synthesizer",
   "name": "Carbonase",
+  "nameJP": "炭素合成器官",
   "mass": 10.0,
   "layers": [
     {
diff --git a/App/resources/assets/parts/Needle.json b/App/resources/assets/parts/Needle.json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Needle",
   "name": "Needle",
+  "nameJP": "トゲ",
   "mass": 30.0,
   "layers": [
     {
diff --git a/App/resources/assets/parts/Oxygenase.json b/App/resources/assets/parts/Oxygenase.json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Synthesizer",
   "name": "Oxygenase",
+  "nameJP": "酸素合成器官",
   "mass": 10.0,
   "layers": [
     {
diff --git a/App/resources/assets/parts/Small_Nucleus.json b/App/resources/assets/parts/Small_Nucleus.json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Nucleus",
   "name": "Small_Nucleus",
+  "nameJP": "小さな核",
   "mass": 10.0,
   "layers": [
     {
diff --git a/App/resources/assets/parts/Small_Wing(left).json b/App/resources/assets/parts/Small_Wing(left).json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Wing",
   "name": "Small_Wing(left)",
+  "nameJP": "小さな羽（左）",
   "mass": 20.0,
   "layers": [
     {
diff --git a/App/resources/assets/parts/Small_Wing(right).json b/App/resources/assets/parts/Small_Wing(right).json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Wing",
   "name": "Small_Wing(right)",
+  "nameJP": "小さな羽（右）",
   "mass": 20.0,
   "layers": [
     {
diff --git a/App/resources/assets/parts/Strong_Needle.json b/App/resources/assets/parts/Strong_Needle.json
@@ -1,6 +1,7 @@
 ﻿{
   "type": "PartAsset_Needle",
   "name": "Strong_Needle",
+  "nameJP": "強いトゲ",
   "mass": 50.0,
   "layers": [
     {
diff --git a/MainViewer.cpp b/MainViewer.cpp
@@ -10,7 +10,7 @@ void MainViewer::init()
 {
 	addChildViewer<FieldViewer>();
 
-	addChildViewer<GUIButton>(U"Cell作成", [this]() { openCellMakingViewer(); })->setViewerRectInLocal(100, 50, 200, 50);
+	addChildViewer<GUIButton>(U"生き物作成", [this]() { openCellMakingViewer(); })->setViewerRectInLocal(100, 50, 250, 50);
 
 	addChildViewer<CellBook>();
 
diff --git a/MainViewer_CellMakingViewer.cpp b/MainViewer_CellMakingViewer.cpp
@@ -2,6 +2,7 @@
 #include "PartConfig.h"
 #include "PartAsset.h"
 #include "PartAsset_Body.h"
+#include "PartAsset_Nucleus.h"
 #include "ProteinAsset.h"
 #include "CellAsset.h"
 #include "GUIButton.h"
@@ -17,13 +18,19 @@ void MainViewer::CellMakingViewer::openBodySculptor()
 {
 	clearEditor();
 
+	getChildViewer<GUIButton>(U"EditBody")->setIsEnabled(false);
+	getChildViewer<GUIButton>(U"EditPart")->setIsEnabled(true);
+
 	addChildViewer<BodySculptor>();
 }
 
 void MainViewer::CellMakingViewer::openPartsAssembler()
 {
 	clearEditor();
 
+	getChildViewer<GUIButton>(U"EditBody")->setIsEnabled(true);
+	getChildViewer<GUIButton>(U"EditPart")->setIsEnabled(false);
+
 	addChildViewer<PartsAssembler>();
 }
 
@@ -44,9 +51,11 @@ void MainViewer::CellMakingViewer::init()
 	setViewerRectInLocal(RectF(1400, 800).setCenter(Scene::CenterF()));
 
 	addChildViewer<GUIButton>(U"ボディ編集", [this]() { openBodySculptor(); })
+		->setName(U"EditBody")
 		->setViewerRectInLocal(5, 5, 190, 35);
 
 	addChildViewer<GUIButton>(U"パーツ配置", [this]() { openPartsAssembler(); })
+		->setName(U"EditPart")
 		->setViewerRectInLocal(5, 45, 190, 35);
 
 	addChildViewer<GUIButton>(U"生き物配置", [this]() { release(); }, false)
@@ -64,7 +73,7 @@ void MainViewer::CellMakingViewer::init()
 
 void MainViewer::CellMakingViewer::update()
 {
-	RectF(getViewerSize()).rounded(16.0).draw(Palette::Gray).drawFrame(2,0, Palette::Black);
+	RectF(getViewerSize()).rounded(16.0).draw(Palette::Gray).drawFrame(2, 0, Palette::Black);
 
 	// 更新
 	m_cellAsset->updateProperties();
@@ -96,7 +105,14 @@ void MainViewer::CellMakingViewer::makeAsset()
 		bodyAsset->getMaterial().setElement(1.0);
 		auto& l = bodyAsset->getShape().emplace_back();
 		l.m_color = Palette::White;
-		l.m_polygon = Circle(10.0).asPolygon();
+		l.m_polygon = Circle(15.0).asPolygon();
+	}
+
+	// Nucleusの設定
+	{
+		auto nucleusAsset = World::GetAssets<PartAsset_Nucleus>().back();
+
+		m_cellAsset->addPartConfig()->setPartAsset(nucleusAsset);
 	}
 
 	m_cellAsset->updateProperties();
diff --git a/MainViewer_CellMakingViewer_BodySculptor_LayerLists.cpp b/MainViewer_CellMakingViewer_BodySculptor_LayerLists.cpp
@@ -53,7 +53,7 @@ void MainViewer::CellMakingViewer::BodySculptor::LayerLists::update()
 		const auto block = RectF(170, m_itemHeight).stretched(-2.0);
 		block.draw(ColorF(1.0, block.mouseOver() ? 0.5 : 0.25)).drawFrame(1.0, Palette::White);
 
-		font(U"Layerの追加").drawAt(block.center(), Palette::Black);
+		font(U"レイヤーの追加").drawAt(block.center(), Palette::Black);
 
 		if (block.leftClicked())
 		{
diff --git a/MainViewer_CellMakingViewer_PartsAssembler_PartList.cpp b/MainViewer_CellMakingViewer_PartsAssembler_PartList.cpp
@@ -1,8 +1,10 @@
 ﻿#include "MainViewer.h"
+#include "PartConfig.h"
 #include "PartAsset.h"
 #include "PartAsset_Body.h"
 #include "PartAsset_Nucleus.h"
 #include "GUISlider.h"
+#include "CellAsset.h"
 #include "World.h"
 
 void MainViewer::CellMakingViewer::PartsAssembler::PartList::init()
@@ -25,7 +27,7 @@ Array<shared_ptr<PartAsset>> MainViewer::CellMakingViewer::PartsAssembler::PartL
 	Array<shared_ptr<PartAsset>> assets;
 
 	for (const auto& m : World::GetAssets<PartAsset>().removed_if([](const auto& pa) { return dynamic_pointer_cast<PartAsset_Body>(pa) ? true : false; })) assets.emplace_back(m);
-	
+
 	return assets;
 }
 
@@ -37,8 +39,35 @@ void MainViewer::CellMakingViewer::PartsAssembler::PartList::drawAssets()
 	for (auto it = assets.begin(); it != assets.end(); ++it)
 	{
 		const auto block = RectF(170, m_itemHeight).stretched(-2.0);
-		block.draw(ColorF(1.0, block.mouseOver() ? 0.5 : 0.25)).drawFrame(1.0, Palette::White);
-		if (block.leftClicked()) m_selectedPart = *it;
+		const bool isNucleus = dynamic_pointer_cast<PartAsset_Nucleus>(*it) != nullptr;
+
+		if (isNucleus)
+		{
+			block.draw(ColorF(Palette::Yellow, block.mouseOver() ? 0.5 : 0.25)).drawFrame(1.0, Palette::White);
+
+			if (block.leftClicked())
+			{
+				auto cellAsset = getParentViewer()->getParentViewer<CellMakingViewer>()->getCellAsset();
+
+				for (const auto& pc : cellAsset->getPartConfigs())
+				{
+					if (dynamic_pointer_cast<PartAsset_Nucleus>(pc->getPartAsset()) != nullptr)
+					{
+						cellAsset->removePartConfig(pc);
+
+						break;
+					}
+				}
+
+				cellAsset->addPartConfig()->setPartAsset(*it);
+			}
+		}
+		else
+		{
+			block.draw(ColorF(1.0, block.mouseOver() ? 0.5 : 0.25)).drawFrame(1.0, Palette::White);
+
+			if (block.leftClicked()) m_selectedPart = *it;
+		}
 
 		// パーツ描画
 		{
@@ -50,7 +79,7 @@ void MainViewer::CellMakingViewer::PartsAssembler::PartList::drawAssets()
 		}
 
 		// 名前描画
-		font((*it)->getName()).draw(4, 4, Palette::Black);
+		font((*it)->getNameJP()).draw(4, 4, Palette::Black);
 
 		moveDrawPos(0, m_itemHeight);
 	}
diff --git a/MainViewer_CellMakingViewer_PartsAssembler_Workspace.cpp b/MainViewer_CellMakingViewer_PartsAssembler_Workspace.cpp
@@ -3,6 +3,7 @@
 #include "PartAsset.h"
 #include "PartConfig.h"
 #include "PartAsset_Body.h"
+#include "PartAsset_Nucleus.h"
 #include "GUIButton.h"
 
 void MainViewer::CellMakingViewer::PartsAssembler::Workspace::init()
@@ -91,6 +92,7 @@ void MainViewer::CellMakingViewer::PartsAssembler::Workspace::update()
 		for (const auto& partConfig : m_cellAsset->getPartConfigs())
 		{
 			if (dynamic_pointer_cast<PartAsset_Body>(partConfig->getPartAsset())) continue;
+			if (dynamic_pointer_cast<PartAsset_Nucleus>(partConfig->getPartAsset())) continue;
 
 			auto t = Transformer2D(partConfig->getMat3x2(), true);
 
diff --git a/PartAsset.cpp b/PartAsset.cpp
@@ -16,6 +16,8 @@ void PartAsset::load(const JSONValue& json)
 {
 	Asset::load(json);
 
+	m_nameJP = json[U"nameJP"].getString();
+
 	// mass
 	m_mass = json[U"mass"].get<double>();
 
@@ -30,6 +32,8 @@ void PartAsset::save(JSONWriter& json) const
 {
 	Asset::save(json);
 
+	json.key(U"nameJP").write(m_nameJP);
+
 	// mass
 	json.key(U"mass").write(m_mass);
 
diff --git a/PartAsset.h b/PartAsset.h
@@ -16,8 +16,11 @@ class PartAsset
 	Storage	m_material;
 	Shape	m_shape;
 
+	String	m_nameJP;
+
 public:
 	// Get
+	const String& getNameJP() const { return m_nameJP; }
 	double	getMass() const { return m_mass; }
 	const Storage& getMaterial() const { return m_material; }
 	const Shape& getShape() const { return m_shape; }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Nucleus",`
`3`	`3`	`"name": "Big_Nucleus",`
	`4`	`+ "nameJP": "大きな核",`
`4`	`5`	`"mass": 40.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Wing",`
`3`	`3`	`"name": "Big_Wing(left)",`
	`4`	`+ "nameJP": "大きな羽(左)",`
`4`	`5`	`"mass": 40.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Wing",`
`3`	`3`	`"name": "Big_Wing(right)",`
	`4`	`+ "nameJP": "大きな羽(右)",`
`4`	`5`	`"mass": 40.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`
`@@ -40,5 +41,5 @@`
`40`	`41`	`]`
`41`	`42`	`},`
`42`	`43`	`"isRight": true,`
`43`		`- "strength": 10000,`
	`44`	`+ "strength": 10000`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Synthesizer",`
`3`	`3`	`"name": "Carbonase",`
	`4`	`+ "nameJP": "炭素合成器官",`
`4`	`5`	`"mass": 10.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Needle",`
`3`	`3`	`"name": "Needle",`
	`4`	`+ "nameJP": "トゲ",`
`4`	`5`	`"mass": 30.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Synthesizer",`
`3`	`3`	`"name": "Oxygenase",`
	`4`	`+ "nameJP": "酸素合成器官",`
`4`	`5`	`"mass": 10.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Nucleus",`
`3`	`3`	`"name": "Small_Nucleus",`
	`4`	`+ "nameJP": "小さな核",`
`4`	`5`	`"mass": 10.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Wing",`
`3`	`3`	`"name": "Small_Wing(left)",`
	`4`	`+ "nameJP": "小さな羽（左）",`
`4`	`5`	`"mass": 20.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Wing",`
`3`	`3`	`"name": "Small_Wing(right)",`
	`4`	`+ "nameJP": "小さな羽（右）",`
`4`	`5`	`"mass": 20.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "PartAsset_Needle",`
`3`	`3`	`"name": "Strong_Needle",`
	`4`	`+ "nameJP": "強いトゲ",`
`4`	`5`	`"mass": 50.0,`
`5`	`6`	`"layers": [`
`6`	`7`	`{`