From f08a38824fe2aa9a719297a6ac722b9db343424e Mon Sep 17 00:00:00 2001
From: Mark Voltov <ius.mark.alex@gmail.com>
Date: Tue, 27 Jun 2023 16:51:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D1=82?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B1=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9=20=D1=87?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20json=20=D0=B2=20=D0=B2=D0=B8=D0=B4?=
 =?UTF-8?q?=D0=B5=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cg/freecad/Frames/material_requirements.JSON | 10 ++++------
 cg/freecad/Frames/modelExport.py             |  8 ++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cg/freecad/Frames/material_requirements.JSON b/cg/freecad/Frames/material_requirements.JSON
index 4c5c3ee..f4eb739 100644
--- a/cg/freecad/Frames/material_requirements.JSON
+++ b/cg/freecad/Frames/material_requirements.JSON
@@ -1,8 +1,6 @@
 
 
-{
-    "Density": "str" ,
-    "DiffuseColor": "", 
-    "EmissiveColor", 
-    "amogus"
-}
\ No newline at end of file
+["Density",
+"DiffuseColor",
+"EmissiveColor"
+]
diff --git a/cg/freecad/Frames/modelExport.py b/cg/freecad/Frames/modelExport.py
index 5ea03f2..2ff6f7b 100644
--- a/cg/freecad/Frames/modelExport.py
+++ b/cg/freecad/Frames/modelExport.py
@@ -27,7 +27,7 @@
 import FreeCAD as App
 import FreeCADGui as Gui
 from helper.is_solid import is_object_solid
-
+import json
 
 doc = App.ActiveDocument
 
@@ -67,7 +67,9 @@ def materialExistenceCheck(doc):
 
 
 #проверим, что материалы правильно описаны:
-material_requirements = {'Density', 'DiffuseColor', 'EmissiveColor', 'amogus'}
+# Открываем файл JSON с требованиями и загружаем его содержимое
+with open('material_requirements.json', 'r') as f:
+    material_requirements = json.load(f)
 
 
 
@@ -153,3 +155,5 @@ def parse_values(value_str):
     return value, unit
 
 
+#todo:
+# сделать проверку на солидовые тела
\ No newline at end of file