Skip to content
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.

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

Dev #34

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
818 changes: 774 additions & 44 deletions assets/models/LeePerrySmith.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions editor.html → demo2.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">

<link href="editor.css" rel="stylesheet" type="text/css">
<link href='http://fonts.googleapis.com/css?family=Lato:300,400,700' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Lato:300,400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
</head>

Expand All @@ -31,8 +31,8 @@
<script src="js/Sortable.min.js"></script>
<script src="js/OrbitControls.js"></script>
<!--<script src="js/OculusRiftEffect.js"></script>-->
<script src="http://spite.github.io/rstats/rStats.js" ></script>
<script src="http://spite.github.io/rstats/rStats.extras.js" ></script>
<script src="https://spite.github.io/rstats/rStats.js" ></script>
<script src="https://spite.github.io/rstats/rStats.extras.js" ></script>
<script src="Wagner.js"></script>
<script src="Wagner.base.js"></script>
<!--<script src="Wagner.experimental.js"></script>-->
Expand Down
6 changes: 3 additions & 3 deletions examples/toon.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#about{ position: absolute; left: 10px; top: 10px; background-color: #000; padding: 10px;}
a{ color: #b70000;}
</style>
<link href='http://fonts.googleapis.com/css?family=Roboto+Condensed:400,700,300' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Roboto+Condensed:400,700,300' rel='stylesheet' type='text/css'>
</head>
<body>

Expand All @@ -32,7 +32,7 @@

<script src="../js/three.min.js"></script>
<!--<script src="http://spite.github.io/rstats/rStats.js" ></script>
<script src="http://spite.github.io/rstats/rStats.extras.js" ></script>-->
<script src="https://spite.github.io/rstats/rStats.extras.js" ></script>-->
<script src="../Wagner.js"></script>
<script src="../Wagner.base.js"></script>
<!--<script src="Wagner.experimental.js"></script>-->
Expand All @@ -52,7 +52,7 @@

function initPass() {

createTeapot();
createLeePerry();

composer = new WAGNER.Composer( renderer, { useRGBA: false } );
toonPass = new WAGNER.ToonPass();
Expand Down
Loading