Skip to content

Commit

Permalink
[QUAL] Replace the fox by a raccoon
Browse files Browse the repository at this point in the history
  • Loading branch information
@xavierjs
xavierjs committed Aug 22, 2019
1 parent c303558 commit e69833e
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 44 deletions.
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

**NOTICE: After a lawsuit filed by Apple(c) the 21th of August 2019, we have removed our main demo, [webojis.com](https://webojis.com) and we have replaced the 3D animated fox by a racoon.**
**NOTICE: After a lawsuit filed by Apple(c) the 21th of August 2019, we have removed our main demo, [webojis.com](https://webojis.com) and we have replaced the 3D animated fox by a raccoon.**

**Indead, Apple(c) owns the intellectual property over all 3D animated foxes (but not on racoons yet). Thank you for your understanding.**
**Indead, Apple(c) owns the intellectual property over all 3D animated foxes (but not on raccoons yet). Thank you for your understanding.**

Get hurry to eat apples, it is good for your health and it is still authorized by Apple lawyers :) . But who knows for how long?

Expand Down Expand Up @@ -65,8 +65,8 @@ All the following demos are included in this repository, in the `/demos` path. Y

* THREE.JS based demos:

* **Cute fox**: [source code](/demos/threejs/fox/), [live demo](https://jeeliz.com/demos/weboji/demos/threejs/fox/)
* **Cute fox from a MP4 video**: [source code](/demos/threejs/externalVideo/), [live demo](https://jeeliz.com/demos/weboji/demos/threejs/externalVideo/)
* **Cute raccoon**: [source code](/demos/threejs/raccoon/), [live demo](https://jeeliz.com/demos/weboji/demos/threejs/raccoon/)
* **Cute raccoon from a MP4 video**: [source code](/demos/threejs/externalVideo/), [live demo](https://jeeliz.com/demos/weboji/demos/threejs/externalVideo/)

* SVG based demos:

Expand Down Expand Up @@ -180,7 +180,7 @@ We are currently working hard on this project. New neural networks are training
### Documentation

* `JEEFACETRANSFERAPI`: All the helpers rely on this API to get the facial morph coefficients. With this documentation you can interface this library with your own 3D or 2D engine. [Click here to read the PDF of the specs](/doc/jeefacetransferAPI.pdf),
* [README.md about using the meshConverter](/meshConverter): Used in the THREE.JS Fox demo
* [README.md about using the meshConverter](/meshConverter): Used in the THREE.JS Raccoon demo


### Articles and tutorials
Expand Down
1 change: 0 additions & 1 deletion assets/3D/meshes/koala.json
View file

This file was deleted.

1 change: 0 additions & 1 deletion assets/3D/meshes/koala_v2.json
View file

This file was deleted.

Binary file modified assets/3D/textures/Fox_albedo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/3D/textures/diffuse_fox_v2.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/3D/textures/diffuse_koala.jpg
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions demos/threejs/externalVideo/demo_webojiThreejsExternalVideo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ function start(videoElement){
assetsParentPath: '../../../assets/3D/',
NNCpath: '../../../dist/',

//FOX :
//RACCOON :
meshURL: 'meshes/fox11_v0.json',
matParameters: {
diffuseMapURL: 'textures/Fox_albedo.png',
specularMapURL: 'textures/Fox_specular.png',
flexMapURL: 'textures/Fox_flex.png'
}, //*/
},

position: [0,-80,0],
scale: 1.2,
Expand Down
20 changes: 10 additions & 10 deletions demos/threejs/externalVideo/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@
<meta http-equiv="content-language" content="en-EN" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">

<title>WEBOJI THREE.JS DEMO</title>
<title>WEBOJI THREE.JS RACCOON FROM EXT VIDEO DEMO</title>

<!-- FACETRASFER LIB : DETECT FACIAL EXPRESSIONS : -->
<script type="text/javascript" src="../../../dist/jeelizFaceTransfer.js"></script>
<script src="../../../dist/jeelizFaceTransfer.js"></script>

<!-- THREE.JS : -->
<script type="text/javascript" src="../../../libs/threejs/v93/three.min.js"></script>
<script src="../../../libs/threejs/v93/three.min.js"></script>

<!-- CUSTOM SMALL LIBS : -->
<script type="text/javascript" src="../../../libs/custom/lib_ajax.js"></script>
<script type="text/javascript" src="../../../libs/custom/lib_array.js"></script>
<script src="../../../libs/custom/lib_ajax.js"></script>
<script src="../../../libs/custom/lib_array.js"></script>

<!-- THREE.JS WEBOJI HELPER : -->
<!-- main helper : -->
<script type="text/javascript" src="../../../helpers/threejs/ThreeJeelizHelper.js"></script>
<script src="../../../helpers/threejs/ThreeJeelizHelper.js"></script>
<!-- required to import the 3D model : -->
<script type="text/javascript" src="../../../helpers/threejs/ThreeMorphAnimGeomBuilder.js"></script>
<script src="../../../helpers/threejs/ThreeMorphAnimGeomBuilder.js"></script>
<!-- required to add a material both flexible and with many morphs : -->
<script type="text/javascript" src="../../../helpers/threejs/ThreeMorphFlexibleMaterialBuilder.js"></script>
<script src="../../../helpers/threejs/ThreeMorphFlexibleMaterialBuilder.js"></script>

<!-- MAIN DEMO SCRIPT WITH main() FUNC : -->
<script type="text/javascript" src="demo_webojiThreejsExternalVideo.js"></script>
<script src="demo_webojiThreejsExternalVideo.js"></script>

<!-- INCLUDE FORK ME ON GITHUB BANNER -->
<script type="text/javascript" src="../../appearance/widget.js"></script>
<script src="../../appearance/widget.js"></script>
<link rel="stylesheet" href="../../appearance/style.css" type="text/css" />

<style type='text/css'>
Expand Down
6 changes: 0 additions & 6 deletions demos/threejs/fox/demo_webojiThreejs.js → demos/threejs/raccoon/demo_webojiThreejs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ function main(){
flexMapURL: 'textures/Fox_flex.png'
}, //*/

//KOALA :
/*meshURL: 'meshes/koala.json', //mesh loaded by default - custom face
matParameters: {
diffuseMapURL: 'textures/diffuse_koala.jpg'
}, //*/

//HUMAN CREEPY FACE :
/*meshURL: 'meshes/faceCustom11_v0.json',
matParameters: {
Expand Down
20 changes: 10 additions & 10 deletions demos/threejs/fox/index.html → demos/threejs/raccoon/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@
<meta http-equiv="content-language" content="en-EN" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">

<title>WEBOJI THREE.JS DEMO</title>
<title>WEBOJI THREE.JS RACCOON DEMO</title>

<!-- FACETRASFER LIB : DETECT FACIAL EXPRESSIONS : -->
<script type="text/javascript" src="../../../dist/jeelizFaceTransfer.js"></script>
<script src="../../../dist/jeelizFaceTransfer.js"></script>

<!-- THREE.JS : -->
<script type="text/javascript" src="../../../libs/threejs/v93/three.min.js"></script>
<script src="../../../libs/threejs/v93/three.min.js"></script>

<!-- CUSTOM SMALL LIBS : -->
<script type="text/javascript" src="../../../libs/custom/lib_ajax.js"></script>
<script type="text/javascript" src="../../../libs/custom/lib_array.js"></script>
<script src="../../../libs/custom/lib_ajax.js"></script>
<script src="../../../libs/custom/lib_array.js"></script>

<!-- THREE.JS WEBOJI HELPER : -->
<!-- main helper : -->
<script type="text/javascript" src="../../../helpers/threejs/ThreeJeelizHelper.js"></script>
<script src="../../../helpers/threejs/ThreeJeelizHelper.js"></script>
<!-- required to import the 3D model : -->
<script type="text/javascript" src="../../../helpers/threejs/ThreeMorphAnimGeomBuilder.js"></script>
<script src="../../../helpers/threejs/ThreeMorphAnimGeomBuilder.js"></script>
<!-- required to add a material both flexible and with many morphs : -->
<script type="text/javascript" src="../../../helpers/threejs/ThreeMorphFlexibleMaterialBuilder.js"></script>
<script src="../../../helpers/threejs/ThreeMorphFlexibleMaterialBuilder.js"></script>

<!-- MAIN DEMO SCRIPT WITH main() FUNC : -->
<script type="text/javascript" src="demo_webojiThreejs.js"></script>
<script src="demo_webojiThreejs.js"></script>

<!-- INCLUDE FORK ME ON GITHUB BANNER -->
<script type="text/javascript" src="../../appearance/widget.js"></script>
<script src="../../appearance/widget.js"></script>
<link rel="stylesheet" href="../../appearance/style.css" type="text/css" />

<style type='text/css'>
Expand Down
16 changes: 8 additions & 8 deletions demos/threejs/tutorial/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@
<title>WEBOJI THREEJS TUTORIAL</title>

<!-- FACETRANSFER LIB : DETECT FACIAL EXPRESSIONS : -->
<script type="text/javascript" src="../../../dist/jeelizFaceTransfer.js"></script>
<script src="../../../dist/jeelizFaceTransfer.js"></script>

<!-- THREE.JS : -->
<script type="text/javascript" src="../../../libs/threejs/v93/three.min.js"></script>
<script src="../../../libs/threejs/v93/three.min.js"></script>

<!-- CUSTOM SMALL LIBS : -->
<script type="text/javascript" src="../../../libs/custom/lib_ajax.js"></script>
<script type="text/javascript" src="../../../libs/custom/lib_array.js"></script>
<script src="../../../libs/custom/lib_ajax.js"></script>
<script src="../../../libs/custom/lib_array.js"></script>

<!-- THREE.JS WEBOJI HELPER : -->
<!-- main helper : -->
<script type="text/javascript" src="../../../helpers/threejs/ThreeJeelizHelper.js"></script>
<script src="../../../helpers/threejs/ThreeJeelizHelper.js"></script>
<!-- required to import the 3D model : -->
<script type="text/javascript" src="../../../helpers/threejs/ThreeMorphAnimGeomBuilder.js"></script>
<script src="../../../helpers/threejs/ThreeMorphAnimGeomBuilder.js"></script>
<!-- required to add a material both flexible and with many morphs : -->
<script type="text/javascript" src="../../../helpers/threejs/ThreeMorphFlexibleMaterialBuilder.js"></script>
<script src="../../../helpers/threejs/ThreeMorphFlexibleMaterialBuilder.js"></script>

<!-- MAIN DEMO SCRIPT WITH main() FUNC : -->
<script type="text/javascript" src="main.js"></script>
<script src="main.js"></script>

<style type='text/css'>
body {overflow: auto; overflow-y: auto; background-color: white; margin: 0px;}
Expand Down
3 changes: 2 additions & 1 deletion demos/threejs/tutorial/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ function main(){
assetsParentPath: '../../../assets/3D/',
NNCpath: '../../../dist/',

//FOX :
//RACCOON:
meshURL: 'meshes/fox.json',
matParameters: {
diffuseMapURL: 'textures/Fox_albedo.png',
specularMapURL: 'textures/Fox_specular.png',
flexMapURL: 'textures/Fox_flex.png'
},

position: [0,-80,0],
scale: 1.2
});
Expand Down

0 comments on commit e69833e

Please sign in to comment.