Skip to content

initial margin #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bercht-a wants to merge 1 commit into
base: master
Choose a base branch
from
Open

initial margin #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 22 additions & 22 deletions sample/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,42 +41,42 @@ function abortUpload() {
}

function errorHandler(evt) {
switch(evt.target.error.code) {
case evt.target.error.NOT_FOUND_ERR:
alert('File Not Found!');
break;
case evt.target.error.NOT_READABLE_ERR:
alert('File is not readable');
break;
case evt.target.error.ABORT_ERR:
break; // noop
default:
alert('An error occurred reading this file.');
switch (evt.target.error.code) {
case evt.target.error.NOT_FOUND_ERR:
alert('File Not Found!');
break;
case evt.target.error.NOT_READABLE_ERR:
alert('File is not readable');
break;
case evt.target.error.ABORT_ERR:
break; // noop
default:
alert('An error occurred reading this file.');
}
}

function updateProgress(evt) {
console.log('progress');
console.log(Math.round((evt.loaded /evt.total) * 100));
if(evt.lengthComputable) {
var percentLoaded = Math.round((evt.loaded /evt.total) * 100);
console.log(Math.round((evt.loaded / evt.total) * 100));
if (evt.lengthComputable) {
var percentLoaded = Math.round((evt.loaded / evt.total) * 100);
if (percentLoaded < 100) {
progress.style.width = percentLoaded + '%';
progress.textContent = percentLoaded + '%';
}
}
}

function onSuccess(evt){
function onSuccess(evt) {
var fileReader = evt.target;
if(fileReader.error) return console.log("error onloadend!?");
if (fileReader.error) return console.log("error onloadend!?");
progress.style.width = '100%';
progress.textContent = '100%';
setTimeout(function() { $progress.classList.remove('loading'); }, 2000);
setTimeout(function () { $progress.classList.remove('loading'); }, 2000);
var parser = new window.DxfParser();
var dxf = parser.parseSync(fileReader.result);
if(dxf) {

if (dxf) {
dxfContentEl.innerHTML = JSON.stringify(dxf, null, 2);
} else {
dxfContentEl.innerHTML = 'No data.';
Expand All @@ -87,11 +87,11 @@ function onSuccess(evt){
// and this discussion https://github.com/mrdoob/three.js/issues/7398
var font;
var loader = new THREE.FontLoader();
loader.load( 'fonts/helvetiker_regular.typeface.json', function ( response ) {
loader.load('fonts/helvetiker_regular.typeface.json', function (response) {
font = response;
cadCanvas = new window.ThreeDxf.Viewer(dxf, document.getElementById('cad-view'), 1000, 800, font);
cadCanvas = new window.ThreeDxf.Viewer(dxf, document.getElementById('cad-view'), 1000, 800, font, 10);
});

}

function handleDragOver(evt) {
Expand Down
25 changes: 11 additions & 14 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,38 +80,35 @@ function getBulgeCurvePoints(startPoint, endPoint, bulge, segments) {
* @param {Object} parent - the parent element to which we attach the rendering canvas
* @param {Number} width - width of the rendering canvas in pixels
* @param {Number} height - height of the rendering canvas in pixels
* @param {Object} font - a font loaded with THREE.FontLoader
* @param {Object} font - a font loaded with THREE.FontLoader
* @param {Number} margin - initial gap between entities and parent clientRect
* @constructor
*/
export function Viewer(data, parent, width, height, font) {
export function Viewer(data, parent, width, height, font, margin) {

createLineTypeShaders(data);

var scene = new THREE.Scene();

// Create scene from dxf object (data)
var i, entity, obj, min_x, min_y, min_z, max_x, max_y, max_z;
var dims = {
min: { x: 0, y: 0, z: 0 },
max: { x: 0, y: 0, z: 0 }
};
var i, entity, obj;

for (i = 0; i < data.entities.length; i++) {
entity = data.entities[i];
obj = drawEntity(entity, data);

if (obj) {
var bbox = new THREE.Box3().setFromObject(obj);
if (isFinite(bbox.min.x) && (dims.min.x > bbox.min.x)) dims.min.x = bbox.min.x;
if (isFinite(bbox.min.y) && (dims.min.y > bbox.min.y)) dims.min.y = bbox.min.y;
if (isFinite(bbox.min.z) && (dims.min.z > bbox.min.z)) dims.min.z = bbox.min.z;
if (isFinite(bbox.max.x) && (dims.max.x < bbox.max.x)) dims.max.x = bbox.max.x;
if (isFinite(bbox.max.y) && (dims.max.y < bbox.max.y)) dims.max.y = bbox.max.y;
if (isFinite(bbox.max.z) && (dims.max.z < bbox.max.z)) dims.max.z = bbox.max.z;
scene.add(obj);
}
obj = null;
}

var dims = new THREE.Box3().setFromObject(scene);

if (margin && margin > 0) {
dims = dims.expandByScalar(margin);
}

width = width || parent.clientWidth;
height = height || parent.clientHeight;
var aspectRatio = width / height;
Expand Down