zcy
/
three.cad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change demo parts to s3

master
howard 2021-04-23 11:31:16 -07:00
parent 5d41e40f6a
commit cef6ae23fd
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extlib/trackball.js
View File

@ -4,7 +4,7 @@ import {
Quaternion, Quaternion,
Vector2, Vector2,
Vector3 Vector3
} from 'three/src/Three'; } from '../node_modules/three/src/Three';
var TrackballControls = function ( object, domElement ) { var TrackballControls = function ( object, domElement ) {
@ -194,7 +194,6 @@ var TrackballControls = function ( object, domElement ) {
if ( _state === STATE.TOUCH_ZOOM_PAN ) { if ( _state === STATE.TOUCH_ZOOM_PAN ) {
// factor = _touchZoomDistanceStart / _touchZoomDistanceEnd;
factor = _touchZoomDistanceEnd / _touchZoomDistanceStart; factor = _touchZoomDistanceEnd / _touchZoomDistanceStart;
_touchZoomDistanceStart = _touchZoomDistanceEnd; _touchZoomDistanceStart = _touchZoomDistanceEnd;

3
src/react/dropDown.jsx
View File

@ -6,8 +6,7 @@ import { useDispatch, useSelector } from 'react-redux'
export const DropDown = () => { export const DropDown = () => {
const arr = [ const arr = [
['https://raw.githubusercontent.com/twpride/threeCAD/master/demo_parts/test2.json', 'test2'], ['https://howardhwang.s3-us-west-1.amazonaws.com/headphone-stand.json', 'headphone-stand'],
['https://raw.githubusercontent.com/twpride/threeCAD/master/demo_parts/headphone-stand.json', 'headphone-stand'],
] ]
const dispatch = useDispatch() const dispatch = useDispatch()

6
src/react/navBar.jsx
View File

@ -1,6 +1,6 @@
import React, { useEffect, useReducer, useState } from 'react'; import React, { useEffect, useReducer } from 'react';
import { useDispatch, useSelector } from 'react-redux' import { useDispatch, useSelector } from 'react-redux'
@ -168,7 +168,7 @@ export const NavBar = () => {
{/* <div className='w-auto h-full flex-1 flex items-center justify-end'> */} {/* <div className='w-auto h-full flex-1 flex items-center justify-end'> */}
<div className='w-auto h-full flex-1 flex items-center justify-end md:justify-between'> <div className='w-auto h-full flex-1 flex items-center justify-end md:justify-between'>
<div className='w-100 h-full items-center font-mono text-lg text-gray-200 select-none hidden md:flex mr-8'> <div className='w-100 h-full items-center font-mono text-lg text-gray-200 select-none hidden lg:flex mr-8'>
<Icon.Logo className='w-auto h-6 mx-1' /> <Icon.Logo className='w-auto h-6 mx-1' />
three.cad three.cad
</div> </div>
@ -187,7 +187,7 @@ export const NavBar = () => {
)) ))
} }
</div> </div>
<div className='w-auto h-full flex-1 items-center justify-end flex-shrink-1 hidden lg:flex'> <div className='w-auto h-full flex-1 items-center justify-end flex-shrink-1 hidden md:flex'>
<DropDown /> <DropDown />
<a href='https://github.com/twpride/threeCAD' className='h-full w=auto'> <a href='https://github.com/twpride/threeCAD' className='h-full w=auto'>
<FaGithub className="btn-green w-auto h-full p-3.5"></FaGithub> <FaGithub className="btn-green w-auto h-full p-3.5"></FaGithub>