Skip to content

Commit

Permalink
Merge pull request #33 from RyugaRyuzaki/develop
Browse files Browse the repository at this point in the history
feat() update
  • Loading branch information
RyugaRyuzaki authored Oct 12, 2024
2 parents 80d32b8 + a5a0c4a commit ed3c276
Show file tree
Hide file tree
Showing 103 changed files with 4,759 additions and 2,264 deletions.
1 change: 0 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ module.exports = {
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-this-alias": "off",

},
};
3,278 changes: 1,789 additions & 1,489 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"preview": "vite preview"
},
"dependencies": {
"@preact/signals-react": "^1.3.7",
"@preact/signals-react": "^2.2.0",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-label": "^2.0.2",
Expand All @@ -21,7 +21,7 @@
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-tooltip": "^1.0.7",
"axios": "^1.6.8",
"camera-controls": "^2.8.3",
"camera-controls": "^2.8.5",
"class-variance-authority": "^0.7.0",
"clay": "file:packages/clay",
"clsx": "^2.1.1",
Expand All @@ -36,6 +36,7 @@
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-icons": "^5.0.1",
"react-resizable-panels": "^2.1.4",
"react-router": "^6.22.1",
"react-router-dom": "^6.22.1",
"react-spring": "^8.0.27",
Expand All @@ -44,11 +45,12 @@
"tailwindcss-animate": "^1.0.7",
"tailwindcss-animated": "^1.0.1",
"three": "^0.163.0",
"three-gpu-pathtracer": "^0.0.23",
"three-mesh-bvh": "^0.7.4",
"three-stdlib": "^2.29.6",
"uuid": "^9.0.1",
"vaul": "^0.9.1",
"web-ifc": "^0.0.54"
"web-ifc": "^0.0.59"
},
"devDependencies": {
"@types/earcut": "^2.1.4",
Expand All @@ -71,7 +73,8 @@
"tsup": "^8.0.2",
"typescript": "^5.0.2",
"vite": "^4.3.9",
"vite-plugin-cross-origin-isolation": "^0.1.6",
"vite-plugin-glsl": "^1.3.0",
"vite-plugin-svgr": "^3.3.0"
}
}
}
88 changes: 0 additions & 88 deletions packages/clay/package-lock.json

This file was deleted.

4 changes: 2 additions & 2 deletions packages/clay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"three-stdlib": "^2.29.6",
"earcut": "^2.2.4",
"uuid": "^9.0.1",
"bim-fragment": "^1.4.2",
"web-ifc": "^0.0.54"
"web-ifc": "^0.0.59"
},
"devDependencies": {
"@types/earcut": "^2.1.4",
"@types/node": "^20.11.25",
"@types/three": "^0.162.0"
}
Expand Down
12 changes: 0 additions & 12 deletions packages/clay/src/base/IfcUnit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,41 @@ export class IfcUnit {
IfcDimensionalExponents: IFC.IfcDimensionalExponents =
new IFC.IfcDimensionalExponents(0, 0, 0, 0, 0, 0, 0);
IfcLengthUnit: IFC.IfcSIUnit = new IFC.IfcSIUnit(
this.IfcDimensionalExponents,
IFC.IfcUnitEnum.LENGTHUNIT,
"",
IFC.IfcSIUnitName.METRE
);
IfcAreaUnit: IFC.IfcSIUnit = new IFC.IfcSIUnit(
this.IfcDimensionalExponents,
IFC.IfcUnitEnum.AREAUNIT,
"",
IFC.IfcSIUnitName.SQUARE_METRE
);
IfcVolumeUnit: IFC.IfcSIUnit = new IFC.IfcSIUnit(
this.IfcDimensionalExponents,
IFC.IfcUnitEnum.VOLUMEUNIT,
"",
IFC.IfcSIUnitName.CUBIC_METRE
);
IfcPlaneAngleUnit: IFC.IfcSIUnit = new IFC.IfcSIUnit(
this.IfcDimensionalExponents,
IFC.IfcUnitEnum.PLANEANGLEUNIT,
IFC.IfcSIPrefix.ATTO,
IFC.IfcSIUnitName.RADIAN
);
IfcMassUnit: IFC.IfcSIUnit = new IFC.IfcSIUnit(
this.IfcDimensionalExponents,
IFC.IfcUnitEnum.MASSUNIT,
IFC.IfcSIPrefix.KILO,
IFC.IfcSIUnitName.GRAM
);
IfcTimeUnit: IFC.IfcSIUnit = new IFC.IfcSIUnit(
this.IfcDimensionalExponents,
IFC.IfcUnitEnum.TIMEUNIT,
IFC.IfcSIPrefix.ATTO,
IFC.IfcSIUnitName.SECOND
);
IfcThermoDynamicTemperatureUnit: IFC.IfcSIUnit = new IFC.IfcSIUnit(
this.IfcDimensionalExponents,
IFC.IfcUnitEnum.THERMODYNAMICTEMPERATUREUNIT,
IFC.IfcSIPrefix.ATTO,
IFC.IfcSIUnitName.PASCAL
);
IfcLuminousIntensityUnit: IFC.IfcSIUnit = new IFC.IfcSIUnit(
this.IfcDimensionalExponents,
IFC.IfcUnitEnum.LUMINOUSINTENSITYUNIT,
IFC.IfcSIPrefix.ATTO,
IFC.IfcSIUnitName.LUMEN
Expand Down Expand Up @@ -99,7 +91,6 @@ export class IfcUnit {
new IFC.IfcGeometricRepresentationSubContext(
new IFC.IfcLabel("Axis"),
new IFC.IfcLabel("Model"),
this.IfcAxis2PlacementGlobal3D,
this.IfcGeometricRepresentationContext,
null,
IFC.IfcGeometricProjectionEnum.GRAPH_VIEW,
Expand All @@ -109,7 +100,6 @@ export class IfcUnit {
new IFC.IfcGeometricRepresentationSubContext(
new IFC.IfcLabel("Body"),
new IFC.IfcLabel("Model"),
this.IfcAxis2PlacementGlobal3D,
this.IfcGeometricRepresentationContext,
null,

Expand All @@ -120,7 +110,6 @@ export class IfcUnit {
new IFC.IfcGeometricRepresentationSubContext(
new IFC.IfcLabel("Box"),
new IFC.IfcLabel("Model"),
this.IfcAxis2PlacementGlobal3D,
this.IfcGeometricRepresentationContext,
null,
IFC.IfcGeometricProjectionEnum.MODEL_VIEW,
Expand All @@ -130,7 +119,6 @@ export class IfcUnit {
new IFC.IfcGeometricRepresentationSubContext(
new IFC.IfcLabel("Box"),
new IFC.IfcLabel("Model"),
this.IfcAxis2PlacementGlobal3D,
this.IfcGeometricRepresentationContext,
null,

Expand Down
34 changes: 34 additions & 0 deletions packages/clay/src/elements/Beam/ArcBeam/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import {v4 as uuidv4} from "uuid";
import {IFC4X3, IFC4X3 as IFC} from "web-ifc";
import {Model} from "../../../base";
import {DynamicElementType} from "../../Elements";
import {IIfcBaseConfig} from "../../types";
import {Profile} from "../../../geometries";
import {ArcBeam} from "./src";

export * from "./src";
/**
*
*/
export class ArcBeamType extends DynamicElementType<ArcBeam> {
attributes: IFC4X3.IfcBeamType;
constructor(model: Model, config: IIfcBaseConfig, public profile: Profile) {
super(model);
const {Name, Description, ObjectType} = config;
this.attributes = new IFC.IfcBeamType(
new IFC.IfcGloballyUniqueId(uuidv4()),
null,
new IFC.IfcLabel(Name),
new IFC.IfcLabel(Description),
new IFC.IfcLabel(ObjectType),
null,
null,
null,
null,
IFC.IfcBeamTypeEnum.BEAM
);
}
protected createElement() {
return new ArcBeam(this.model, this);
}
}
Loading

0 comments on commit ed3c276

Please sign in to comment.