Fixed OBJ vertex count + camelCase for entities

Author: jbrouwerdigibase

ifc2json.py

@@ -57,6 +57,6 @@
         else:
             print('Version ' + args.v + ' is not supported')
     else:
-        print(args.i + ' is not a valid file')
+        print(str(args.i) + ' is not a valid file')
 t1_stop = perf_counter()
 print("Conversion took ", t1_stop-t1_start, " seconds") 

ifcjson/ifc2json4.py

@@ -57,39 +57,43 @@ def spf2Json(self):
 
     @functools.lru_cache(maxsize=maxCache)
     def entityToDict(self, entity):
+
+        # Entitie names must be in camelCase
+        entityType = entity.is_a()
+        entityType = entityType[0].lower() + entityType[1:]
         entityAttributes = entity.__dict__
 
         ref = {
-            "type": entity.is_a()
+            "type": entityType
         }
 
         # Add missing GlobalId to OwnerHistory
-        if entity.is_a() == 'IfcOwnerHistory':
+        if entityType == 'ifcOwnerHistory':
             if not entity.id() in self.ownerHistories:
                 self.ownerHistories[entity.id()] = guid.new()
-            entityAttributes["GlobalId"] = self.ownerHistories[entity.id()]
+            entityAttributes["globalId"] = self.ownerHistories[entity.id()]
 
         # Add missing GlobalId to IfcGeometricRepresentationContext
-        if entity.is_a() == 'IfcGeometricRepresentationContext':
+        if entityType == 'ifcGeometricRepresentationContext':
             if not entity.id() in self.representationContexts:
                 self.representationContexts[entity.id()] = guid.new()
-            entityAttributes["GlobalId"] = self.representationContexts[entity.id()]
+            entityAttributes["globalId"] = self.representationContexts[entity.id()]
 
         # check for globalid
         if "GlobalId" in entityAttributes:
             uuid = guid.split(guid.expand(entityAttributes["GlobalId"]))[1:-1]
             ref["ref"] = uuid
             if not entityAttributes["GlobalId"] in self.id_objects:
                 d = {
-                    "type": entity.is_a()
+                    "type": entityType
                 }
 
                 # Add missing GlobalId to OwnerHistory
-                if entity.is_a() == 'IfcOwnerHistory':
+                if entityType == 'ifcOwnerHistory':
                     d["globalId"] = guid.split(guid.expand(self.ownerHistories[entity.id()]))[1:-1]
 
                 # Add missing GlobalId to IfcGeometricRepresentationContext
-                if entity.is_a() == 'IfcGeometricRepresentationContext':
+                if entityType == 'ifcGeometricRepresentationContext':
                     d["globalId"] = guid.split(guid.expand(self.representationContexts[entity.id()]))[1:-1]
 
                 for i in range(0,len(entity)):
@@ -101,7 +105,7 @@ def entityToDict(self, entity):
                         if attr in entityAttributes:
                             jsonValue = self.getEntityValue(entityAttributes[attr])
                             if jsonValue:
-                                if ((entity.is_a() == 'IfcOwnerHistory') and (attr == "GlobalId")):
+                                if ((entityType == 'ifcOwnerHistory') and (attr == "GlobalId")):
                                     pass
                                 else:
                                     d[attrKey] = jsonValue
@@ -126,7 +130,7 @@ def entityToDict(self, entity):
             return ref
         else:
             d = {
-                "type": entity.is_a()
+                "type": entityType
             }
 
             for i in range(0,len(entity)):

ifcjson/ifc2json5a.py

@@ -31,6 +31,7 @@
 import ifcopenshell
 import ifcopenshell.guid as guid
 import ifcjson.common as common
+import copy
 
 
 explicitInverseAttributes = {
@@ -75,6 +76,9 @@ def entityToDict(self, entity, objData, parent=None):
         entityType = entity.is_a()
         entityType = entityType[3:]
 
+        # Entitie names must be in camelCase
+        entityType = entityType[0].lower() + entityType[1:]
+
         ref = {
             'type': entityType
         }
@@ -230,12 +234,12 @@ def entityToDict(self, entity, objData, parent=None):
                                         id = guid.split(guid.expand(guid.new()))[1:-1]
                                         d['representations'] = [
                                             {
-                                                "type": "ShapeRepresentation",
+                                                "type": "shapeRepresentation",
                                                 "ref": id
                                             }
                                         ]
                                         self.representations[id] = {
-                                            "type": "ShapeRepresentation",
+                                            "type": "shapeRepresentation",
                                             "globalId": id,
                                             "representationIdentifier": "Body",
                                             "representationType": "OBJ",
@@ -323,6 +327,7 @@ def getEntityValue(self, value, objData):
     # convert IFC SPF file into OBJ using IfcConvert and extract OBJ objects
     def getObjData(self, ifcFilePath):
         objFilePath = NamedTemporaryFile(suffix='.obj', delete=True).name
+        print(objFilePath)
 
         # Convert IFC to OBJ using IfcConvert (could also be done for glTF or Collada)
         subprocess.run([
@@ -336,21 +341,39 @@ def getObjData(self, ifcFilePath):
             header = True
             groupId = ''
             groupData = []
+            vertexIterator = 0
+            vertexCount = 0
             f = open(objFilePath, 'r')
+            lc = 0
             for line in f:
+                lc +=1
 
                 # find group
                 if line[0] == 'g':
                     header = False
+                    vertexCount = copy.deepcopy(vertexIterator)
                     objData[groupId] = ''.join(groupData)
                     groupId = line.split()[1]
                     groupData = []
                 else:
                     if header:
                         pass
                     else:
-                        if line[0] == 'v' or  line[0] == 'f':
+                        if line[0:2] == 'v ':
                             groupData.append(line)
+                            vertexIterator += 1
+                        elif line[0] == 'f':
+                            fl = []
+                            face = line[2:].rstrip().split(' ')
+                            for fp in face:
+                                p = fp.split('//')
+                                ps0 = int(p[0]) - vertexCount
+                                ps1 = int(p[1]) - vertexCount
+                                ps = str(ps0) + '//' + str(ps1)
+                                fl.append(ps)
+
+                            fs = 'f ' + ' '.join(fl) + '\n'
+                            groupData.append(fs)
             return objData
         else:
             print('Creating intermediate OBJ failed')