Removed all mixamo tags

nilooy · May 3, 2021 · 15fb69f · 15fb69f
1 parent 5273834
commit 15fb69f
Show file tree

Hide file tree

Showing 40 changed files with 28,546 additions and 9,811 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.idea/aws.xml b/.idea/aws.xml
diff --git a/.idea/react-mixamo.iml b/.idea/react-mixamo.iml
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
-# ⛹⛹⛹ Mixamo Character Animation Combiner ⛹⛹⛹
+# ⛹⛹⛹ Character Animation Combiner ⛹⛹⛹
 
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## [LIVE HERE 💎](https://nilooy.github.io/mixamo-animation-combiner/)
+## [LIVE HERE 💎](https://nilooy.github.io/character-animation-combiner)
 
 ## Run Locally
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "react-mixamo",
+  "name": "character-animation-combiner",
   "version": "0.1.0",
   "private": true,
   "author": {
@@ -18,7 +18,7 @@
     "react-scripts": "3.4.3",
     "three": "^0.120.0"
   },
-  "homepage": "mixamo-animation-combiner",
+  "homepage": "character-animation-combiner",
   "scripts": {
     "predeploy": "yarn run build",
     "deploy": "gh-pages -d build",

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Mixamo Character Animation Combiner</title>
+    <title>Character Animation Combiner</title>
     <!--Import Google Icon Font-->
     <link
       href="https://fonts.googleapis.com/icon?family=Material+Icons"

diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/manifest.json b/public/manifest.json
diff --git a/public/preview.png b/public/preview.png
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/src/App.js b/src/App.js
diff --git a/src/assets/img/github.png b/src/assets/img/github.png
diff --git a/src/assets/img/twitter.png b/src/assets/img/twitter.png
diff --git a/src/assets/model3d/default.glb b/src/assets/model3d/default.glb
diff --git a/src/components/AnimationList.js b/src/components/AnimationList.js
diff --git a/src/components/ChangeTexture.js b/src/components/ChangeTexture.js
@@ -12,7 +12,6 @@ const ChangeTexture = () => {
   } = useContext(ModalContext);
 
   useEffect(() => {
-    console.log(mainModel);
     if (mainModel) {
       mainModel.traverse((child) => {
         if (child.isMesh && typeof child.material.map !== "function") {

diff --git a/src/components/Export.js b/src/components/Export.js
@@ -35,7 +35,7 @@ const Export = () => {
       exporter.parse(
         mainModel,
         function (result) {
-          saveArrayBuffer(result, `mixamo-${new Date().getTime()}.glb`);
+          saveArrayBuffer(result, `cac-${new Date().getTime()}.glb`);
         },
         { trs: true, binary: true, animations: animations }
       );
@@ -57,7 +57,7 @@ const Export = () => {
         mainModel,
         function (result) {
           var output = JSON.stringify(result, null, 2);
-          saveString(output, `mixamo-${new Date().getTime()}.gltf`);
+          saveString(output, `cac-${new Date().getTime()}.gltf`);
         },
         { trs: true, binary: false, animations: animations }
       );

diff --git a/src/components/Info.js b/src/components/Info.js
diff --git a/src/components/Layout.js b/src/components/Layout.js
@@ -8,14 +8,14 @@ const Layout = ({ children }) => {
       <nav className="black">
         <div className="nav-wrapper ">
           <div className="brand-logo center">
-            Mixamo Character Animation Combiner
+            Character Animation Combiner
           </div>
           <ul className="right">
             <li>
               <a
                 rel="noopener noreferrer"
                 style={{ padding: 10 }}
-                href="https://github.com/nilooy/mixamo-animation-combiner"
+                href="https://github.com/nilooy/character-animation-combiner"
                 target="_blank"
               >
                 <img src={GithubImage} alt="github logo" width="40" />

diff --git a/src/components/ModelViewer.js b/src/components/ModelViewer.js
diff --git a/src/components/Preloader.js b/src/components/Preloader.js
diff --git a/src/components/UploadButton.js b/src/components/UploadButton.js
diff --git a/src/components/UploadSection.js b/src/components/UploadSection.js
diff --git a/src/context/ModelContext.js b/src/context/ModelContext.js
diff --git a/src/context/createDataContext.js b/src/context/createDataContext.js
diff --git a/src/helpers/applyBoxUV.js b/src/helpers/applyBoxUV.js
diff --git a/src/helpers/loadModel.js b/src/helpers/loadModel.js
@@ -14,6 +14,10 @@ export default (path, type, callback) => {
         if (child.isMesh) {
           child.castShadow = true;
           child.receiveShadow = true;
+
+          if (child.isMaterial) {
+            console.log("asd");
+          }
         }
       });
 

diff --git a/src/helpers/resizeWindow.js b/src/helpers/resizeWindow.js
diff --git a/src/helpers/setCamera.js b/src/helpers/setCamera.js
diff --git a/src/helpers/setControls.js b/src/helpers/setControls.js
diff --git a/src/helpers/setLights.js b/src/helpers/setLights.js
diff --git a/src/index.css b/src/index.css
diff --git a/src/index.js b/src/index.js
diff --git a/src/pages/Home.js b/src/pages/Home.js
diff --git a/src/threeExport.js b/src/threeExport.js