From 637cc6677dace087410079fd2ee434a4fbd45adb Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 15:14:43 +0800
Subject: [PATCH] 1. 添加定时器获取当前EFEM位置,并且更新(包括手臂是否有片)

---
 SourceCode/Bond/Servo/CLoadPort.cpp |  374 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 239 insertions(+), 135 deletions(-)

diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index a61e86e..c6591e7 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -12,16 +12,25 @@
 	}																		\
 }
 
+#define CHECK_WRITE_STEP_SIGNAL2(addr, data, size) {							\
+	BOOL bFlag = isBitOn(data, size, addr);									\
+	SERVO::CStep* pStep = getStep(addr);									\
+	if (pStep != nullptr) {													\
+		((CWriteStep*)pStep)->onRecvSignal(bFlag ? addr : 0);				\
+	}																		\
+}
+
 namespace SERVO {
 	CLoadPort::CLoadPort() : CEquipment()
 	{
 		m_nIndex = 0;
 		m_portType = PortType::Loading;
-		m_portMode = PortMode::InService;
+		m_portMode = PortMode::ReadyToLoad;
 		m_cassetteType = CassetteType::G1;
 		m_transferMode = TransferMode::AGVMode;
 		m_bEnable = FALSE;
 		m_bAutoChangeEnable = FALSE;
+		m_nNextCassetteSequenceNo = 0;
 	}
 
 	CLoadPort::~CLoadPort()
@@ -51,8 +60,18 @@
 		// 加入Pin初始化代码
 		LOGI("<CLoadPort>initPins");
 		addPin(SERVO::PinType::INPUT, _T("In"));
-		addPin(SERVO::PinType::OUTPUT, _T("Out1"));
-		addPin(SERVO::PinType::OUTPUT, _T("Out2"));
+		addPin(SERVO::PinType::OUTPUT, _T("Out"));
+	}
+
+	// 必须要实现的虚函数,在此初始化Slot信息
+	void CLoadPort::initSlots()
+	{
+		for (int i = 0; i < SLOT_MAX; i++) {
+			m_slot[i].enable();
+			m_slot[i].setPosition(m_nID);
+			m_slot[i].setNo(i + 1);
+			m_slot[i].setName((std::string("Slot") + std::to_string(i+1)).c_str());
+		}
 	}
 
 	void CLoadPort::initSteps()
@@ -82,7 +101,7 @@
 			// Type
 			static char* pszName[] = { STEP_EQ_PORT1_TYPE, STEP_EQ_PORT2_TYPE, STEP_EQ_PORT3_TYPE, STEP_EQ_PORT4_TYPE };
 			static int dev[] = { 0x6010 , 0x6020, 0x6030, 0x6040 };
-			static int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
+			static int writeSignalDev[] = { 0x90, 0x91, 0x92, 0x93 };
 			static int addr[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE, STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -103,7 +122,7 @@
 			// Mode
 			static char* pszName[] = { STEP_EQ_PORT1_MODE, STEP_EQ_PORT2_MODE, STEP_EQ_PORT3_MODE, STEP_EQ_PORT4_MODE };
 			static int dev[] = { 0x6011, 0x6021, 0x6031, 0x6041 };
-			static int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
+			static int writeSignalDev[] = { 0x98, 0x99, 0x9a, 0x9b };
 			static int addr[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE, STEP_ID_PORT3_MODE_CHANGE, STEP_ID_PORT4_MODE_CHANGE };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -124,7 +143,7 @@
 			// Cassette type
 			static char* pszName[] = { STEP_EQ_PORT1_CASSETTE_TYPE, STEP_EQ_PORT2_CASSETTE_TYPE, STEP_EQ_PORT3_CASSETTE_TYPE, STEP_EQ_PORT4_CASSETTE_TYPE };
 			static int dev[] = { 0x6012, 0x6022, 0x6032, 0x6042 };
-			static int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
+			static int writeSignalDev[] = { 0xa0, 0xa1, 0xa2, 0xa3 };
 			static int addr[] = { STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, STEP_ID_PORT4_CASSETTE_TYPE_CHANGE };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -145,7 +164,7 @@
 			// Transfer type
 			static char* pszName[] = { STEP_EQ_PORT1_TRANSFER_MODE, STEP_EQ_PORT2_TRANSFER_MODE, STEP_EQ_PORT3_TRANSFER_MODE, STEP_EQ_PORT4_TRANSFER_MODE };
 			static int dev[] = { 0x6014, 0x6024, 0x6034, 0x6044 };
-			static int writeSignalDev[] = { 0xb8, 0xb9, 0xba, 0xbb };
+			static int writeSignalDev[] = { 0xa8, 0xa9, 0xaa, 0xab };
 			static int addr[] = { STEP_ID_PORT1_TRANSFER_MODE_CHANGE, STEP_ID_PORT2_TRANSFER_MODE_CHANGE, STEP_ID_PORT3_TRANSFER_MODE_CHANGE, STEP_ID_PORT4_TRANSFER_MODE_CHANGE };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -166,7 +185,7 @@
 			// Port enable
 			static char* pszName[] = { STEP_EQ_PORT1_ENABLE, STEP_EQ_PORT2_ENABLE, STEP_EQ_PORT3_ENABLE, STEP_EQ_PORT4_ENABLE };
 			static int dev[] = { 0x6015, 0x6025, 0x6035, 0x6045 };
-			static int writeSignalDev[] = { 0xc0, 0xc1, 0xc2, 0xc3 };
+			static int writeSignalDev[] = { 0xb0, 0xb1, 0xb2, 0xb3 };
 			static int addr[] = { STEP_ID_PORT1_ENABLE_MODE_CHANGE, STEP_ID_PORT2_ENABLE_MODE_CHANGE, STEP_ID_PORT3_ENABLE_MODE_CHANGE, STEP_ID_PORT4_ENABLE_MODE_CHANGE };
 
 			CEqReadStep* pStep = new CEqReadStep(dev[m_nIndex], sizeof(short),
@@ -289,7 +308,7 @@
 			pStep->setName(pszName[m_nIndex]);
 			pStep->setWriteSignalDev(0x128 + m_nIndex);
 			pStep->setDataDev(dev[m_nIndex]);
-			if (addStep(STEP_ID_PROT1_TYPE_AUTO_CHANGE_REPLY + m_nIndex, pStep) != 0) {
+			if (addStep(STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY + m_nIndex, pStep) != 0) {
 				delete pStep;
 			}
 		}
@@ -347,6 +366,28 @@
 	void CLoadPort::serialize(CArchive& ar)
 	{
 		CEquipment::serialize(ar);
+
+		if (ar.IsStoring()) {
+			ar << m_nIndex;
+			//ar << (int)m_portType;
+			//ar << (int)m_portMode;
+			//ar << (int)m_cassetteType;
+			//ar << (int)m_transferMode;
+			//ar << m_bEnable;
+			//ar << m_bAutoChangeEnable;
+			m_portStatusReport.serialize(ar);
+		}
+		else {
+			int temp;
+			ar >> m_nIndex;
+			//ar >> temp; m_portType = (PortType)temp;
+			//ar >> temp; m_portMode = (PortMode)temp;
+			//ar >> temp; m_cassetteType = (CassetteType)temp;
+			//ar >> temp; m_transferMode = (TransferMode)temp;
+			//ar >> m_bEnable;
+			//ar >> m_bAutoChangeEnable;
+			m_portStatusReport.serialize(ar);
+		}
 	}
 
 	void CLoadPort::getAttributeVector(CAttributeVector& attrubutes)
@@ -374,21 +415,6 @@
 	int CLoadPort::recvIntent(CPin* pPin, CIntent* pIntent)
 	{
 		return __super::recvIntent(pPin, pIntent);
-	}
-
-	int CLoadPort::outputGlass(int port)
-	{
-		return __super::outputGlass(port);
-	}
-
-	BOOL CLoadPort::glassWillArrive(CGlass* pGlass)
-	{
-		BOOL bRet = __super::glassWillArrive(pGlass);
-		if (!bRet) {
-			return FALSE;
-		}
-
-		return (m_glassList.size() < 8);
 	}
 
 	int CLoadPort::sendCassetteCtrlCmd(short cmd,
@@ -424,6 +450,16 @@
 		Unlock();
 
 		return pStep;
+	}
+
+	short CLoadPort::getNextCassetteSequenceNo()
+	{
+		m_nNextCassetteSequenceNo++;
+		if (m_nNextCassetteSequenceNo >= 1000) {
+			m_nNextCassetteSequenceNo = 0;
+		}
+
+		return (m_nIndex + 1) * 1000 + m_nNextCassetteSequenceNo;
 	}
 
 	void CLoadPort::setIndex(unsigned int index)
@@ -803,6 +839,8 @@
 
 	void CLoadPort::onReceiveLBData(const char* pszData, size_t size)
 	{
+		__super::onReceiveLBData(pszData, size);
+
 		static int type[] = { STEP_ID_PORT1_TYPE_CHANGE, STEP_ID_PORT2_TYPE_CHANGE,
 			STEP_ID_PORT3_TYPE_CHANGE, STEP_ID_PORT4_TYPE_CHANGE };
 		static int mode[] = { STEP_ID_PORT1_MODE_CHANGE, STEP_ID_PORT2_MODE_CHANGE,
@@ -837,12 +875,12 @@
 		static int cassetteTypeReply[] = { STEP_ID_PROT1_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT2_CASSETTE_TYPE_CHANGE_REPLY,
 			STEP_ID_PROT3_CASSETTE_TYPE_CHANGE_REPLY, STEP_ID_PROT4_CASSETTE_TYPE_CHANGE_REPLY };
 
-		CHECK_READ_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
-		CHECK_READ_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(typeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(modeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(transferModeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(enableModeReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(typeAutoReply[m_nIndex], pszData, size);
+		CHECK_WRITE_STEP_SIGNAL2(cassetteTypeReply[m_nIndex], pszData, size);
 	}
 
 	int CLoadPort::decodePortStatusReport(CStep* pStep, const char* pszData, size_t size)
@@ -877,21 +915,22 @@
 
 		LOGI("<CLoadPort-%d>准备设置Port type<%d>", m_nIndex, (int)type);
 		short value = (short)type;
-		if (onWritedBlock != nullptr) {
-			pStep->writeDataEx((const char*)&value, sizeof(short), onWritedBlock);
-		}
-		else {
-			pStep->writeDataEx((const char*)&value, sizeof(short), [&](int code) -> int {
-				if (code == WOK) {
-					LOGI("<CLoadPort-%d>设置Port type成功.", m_nIndex);
-				}
-				else {
-					LOGI("<CLoadPort-%d>设置Port type失败,code:%d", m_nIndex, code);
-				}
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_portType = type;
+				LOGI("<CLoadPort-%d>设置Port type成功.", m_nIndex);
+			}
+			else {
+				LOGI("<CLoadPort-%d>设置Port type失败,code:%d", m_nIndex, code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
 
-				return 0;
-				});
-		}
+			return 0;
+			});
 
 		return 0;
 	}
@@ -906,21 +945,21 @@
 
 		LOGI("<CLoadPort-%d>准备%s Port", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
 		short value = bEnable ? 1 : 2;
-		if (onWritedBlock != nullptr) {
-			pStep->writeDataEx((const char*)&value, sizeof(short), onWritedBlock);
-		}
-		else {
-			pStep->writeDataEx((const char*)&value, sizeof(short), [&](int code) -> int {
-				if (code == WOK) {
-					LOGI("<CLoadPort-%d>%s Port成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
-				}
-				else {
-					LOGI("<CLoadPort-%d>%s  Port失败,code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
-				}
-
-				return 0;
-				});
-		}
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_bEnable = bEnable;
+				LOGI("<CLoadPort-%d>%s Port成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+			}
+			else {
+				LOGI("<CLoadPort-%d>%s  Port失败,code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
 
 		return 0;
 	}
@@ -935,21 +974,21 @@
 
 		LOGI("<CLoadPort-%d>准备设置Port mode<%d>", m_nIndex, (int)mode);
 		short value = (short)mode;
-		if (onWritedBlock != nullptr) {
-			pStep->writeDataEx((const char*)&value, sizeof(short), onWritedBlock);
-		}
-		else {
-			pStep->writeDataEx((const char*)&value, sizeof(short), [&](int code) -> int {
-				if (code == WOK) {
-					LOGI("<CLoadPort-%d>设置Port mode成功.", m_nIndex);
-				}
-				else {
-					LOGI("<CLoadPort-%d>设置Port mode失败,code:%d", m_nIndex, code);
-				}
-
-				return 0;
-				});
-		}
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_portMode = mode;
+				LOGI("<CLoadPort-%d>设置Port mode成功.", m_nIndex);
+			}
+			else {
+				LOGI("<CLoadPort-%d>设置Port mode失败,code:%d", m_nIndex, code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
 
 		return 0;
 	}
@@ -964,21 +1003,21 @@
 
 		LOGI("<CLoadPort-%d>准备设置Cassette Type<%d>", m_nIndex, (int)type);
 		short value = (short)type;
-		if (onWritedBlock != nullptr) {
-			pStep->writeDataEx((const char*)&value, sizeof(short), onWritedBlock);
-		}
-		else {
-			pStep->writeDataEx((const char*)&value, sizeof(short), [&](int code) -> int {
-				if (code == WOK) {
-					LOGI("<CLoadPort-%d>设置Cassette Type成功.", m_nIndex);
-				}
-				else {
-					LOGI("<CLoadPort-%d>设置Cassette Type失败,code:%d", m_nIndex, code);
-				}
-
-				return 0;
-				});
-		}
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_cassetteType = type;
+				LOGI("<CLoadPort-%d>设置Cassette Type成功.", m_nIndex);
+			}
+			else {
+				LOGI("<CLoadPort-%d>设置Cassette Type失败,code:%d", m_nIndex, code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
 
 		return 0;
 	}
@@ -993,21 +1032,21 @@
 
 		LOGI("<CLoadPort-%d>准备设置Transfer mode<%d>", m_nIndex, (int)mode);
 		short value = (short)mode;
-		if (onWritedBlock != nullptr) {
-			pStep->writeDataEx((const char*)&value, sizeof(short), onWritedBlock);
-		}
-		else {
-			pStep->writeDataEx((const char*)&value, sizeof(short), [&](int code) -> int {
-				if (code == WOK) {
-					LOGI("<CLoadPort-%d>设置Transfer mode成功.", m_nIndex + 1);
-				}
-				else {
-					LOGI("<CLoadPort-%d>设置Transfer mode失败,code:%d", m_nIndex + 1, code);
-				}
-
-				return 0;
-				});
-		}
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_transferMode = mode;
+				LOGI("<CLoadPort-%d>设置Transfer mode成功.", m_nIndex + 1);
+			}
+			else {
+				LOGI("<CLoadPort-%d>设置Transfer mode失败,code:%d", m_nIndex + 1, code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
 
 		return 0;
 	}
@@ -1022,33 +1061,63 @@
 
 		LOGI("<CLoadPort-%d>准备%s Auto Change", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
 		short value = bEnable ? 1 : 2;
-		if (onWritedBlock != nullptr) {
-			pStep->writeDataEx((const char*)&value, sizeof(short), onWritedBlock);
-		}
-		else {
-			pStep->writeDataEx((const char*)&value, sizeof(short), [&](int code) -> int {
-				if (code == WOK) {
-					LOGI("<CLoadPort-%d>%s Auto Change成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
-				}
-				else {
-					LOGI("<CLoadPort-%d>%s  Auto Change失败,code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
-				}
-
-				return 0;
-				});
-		}
+		pStep->writeDataEx((const char*)&value, sizeof(short), [&, onWritedBlock](int code) -> int {
+			// test
+			code = WOK;
+			if (code == WOK) {
+				m_bAutoChangeEnable = bEnable;
+				LOGI("<CLoadPort-%d>%s Auto Change成功.", m_nIndex, bEnable ? _T("启用") : _T("禁用"));
+			}
+			else {
+				LOGI("<CLoadPort-%d>%s  Auto Change失败,code:%d", m_nIndex, bEnable ? _T("启用") : _T("禁用"), code);
+			}
+			if (onWritedBlock != nullptr) {
+				return onWritedBlock(code);
+			}
+			return 0;
+			});
 
 		return 0;
+	}
+
+	void CLoadPort::localEanblePort(BOOL bEnable)
+	{
+		m_bEnable = bEnable;
+	}
+
+	void CLoadPort::localSetPortType(PortType type)
+	{
+		m_portType = type;
+	}
+
+	void CLoadPort::localSetPortMode(PortMode mode)
+	{
+		m_portMode = mode;
+	}
+
+	void CLoadPort::localSetCessetteType(CassetteType type)
+	{
+		m_cassetteType = type;
+	}
+
+	void CLoadPort::localSetTransferMode(TransferMode mode)
+	{
+		m_transferMode = mode;
+	}
+
+	void CLoadPort::localAutoChangeEnable(BOOL bEnable)
+	{
+		m_bAutoChangeEnable = bEnable;
 	}
 
 	/*
 	 * 生成测试用的玻璃列表
 	 */
-	int CLoadPort::testGenerateGlassList(MaterialsType type, int count, const char* pszPrefix, int startSuffix)
+	int CLoadPort::testGenerateGlassList(MaterialsType type)
 	{
 		// 如果非空就不生成了
 		Lock();
-		if (!m_glassList.empty()) {
+		if (hasGlass()) {
 			Unlock();
 			return -1;
 		}
@@ -1056,30 +1125,65 @@
 
 
 		char szBuffer[64];
-		int suffix = startSuffix;
-		for (int i = 0; i < count; i++) {
-			CJobDataB jb;
-			CJobDataS js;
+		for (int i = 0; i < 1; i++) {
+			if (!m_slot[i].isEnable()) continue;
 
-			sprintf_s(szBuffer, "%s%d", pszPrefix, suffix++);
-			jb.setGlassId(szBuffer);
+			CJobDataS js;
+			js.setCassetteSequenceNo(getNextCassetteSequenceNo());
+			js.setJobSequenceNo(m_slot[i].getNo());
+			sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
+			//js.setGlass1Id(szBuffer);
+			js.setJobType(1);
 			js.setMaterialsType((int)type);
-			if (type == MaterialsType::G1) {
-				js.setGlass1Id(szBuffer);
-			}
-			else if (type == MaterialsType::G2) {
-				js.setGlass2Id(szBuffer);
-			}
 
 			CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+			pGlass->addPath(m_nID, 0);
+			pGlass->processEnd(m_nID, 0);
 			pGlass->setID(szBuffer);
-			pGlass->setJobDataB(&jb);
 			pGlass->setType(type);
 			pGlass->setJobDataS(&js);
-			addGlassToList(pGlass);
+			m_slot[i].setContext(pGlass);
 		}
 
 		return 0;
 	}
 
+	int CLoadPort::testGenerateGlassListFromConfig(const SERVO::PortConfig& config)
+	{
+		char szBuffer[64];
+		for (const auto& slot : config.vecSlot) {
+			int nSlotIndex = slot.nSlotID - 1;
+			if (nSlotIndex < 0 || nSlotIndex >= SLOT_MAX) {
+				continue;
+			}
+			if (!slot.isEnabled) {
+				m_slot[nSlotIndex].setContext(nullptr);
+				continue;
+			}
+
+			CJobDataS js;
+			js.setCassetteSequenceNo(getNextCassetteSequenceNo());
+			js.setJobSequenceNo(m_slot[nSlotIndex].getNo());
+
+			sprintf_s(szBuffer, 64, "%05d%05d", js.getCassetteSequenceNo(), js.getJobSequenceNo());
+			js.setJobType(1);
+			js.setMaterialsType(config.nMaterialType);
+
+			js.setLotId(config.strLotID.c_str());
+			js.setProductId(config.strProductID.c_str());
+			js.setOperationId(config.strOperationID.c_str());
+			js.setGlass1Id(szBuffer);
+
+			CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+			pGlass->addPath(m_nID, 0);
+			pGlass->processEnd(m_nID, 0);
+			pGlass->setID(szBuffer);
+			pGlass->setType(static_cast<SERVO::MaterialsType>(config.nMaterialType));
+			pGlass->setJobDataS(&js);
+
+			m_slot[nSlotIndex].setContext(pGlass);
+		}
+
+		return 0;
+	}
 }

--
Gitblit v1.9.3