Skip to content

Commit 9bca93b

Browse files
author
smzeng
committed
updated front page of website for tea event
1 parent f55f3da commit 9bca93b

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

public/assets/high_Tea.png

55.5 KB
Loading

public/models/teapot.fbx

308 KB
Binary file not shown.

src/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class App extends Component {
66
render() {
77
const { width, height } = this.props.size;
88
return (
9-
<div className="App">
9+
<div className="App" style="background-image: url('high_Tea.png');">
1010
<Background width={width} height={height} />
1111
<h1 className="center w-100">SIGGRAPH @ UIUC</h1>
1212
</div>

src/Background.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,16 @@ class Background extends Component {
2727
// ADD CUBE
2828
let that = this;
2929
const loader = new FBXLoader();
30-
loader.load("models/index.fbx", function(object) {
30+
//switched to teapot for now
31+
loader.load("models/teapot.fbx", function(object) {
3132
object.traverse(function(child) {
3233
if (child.isMesh) {
3334
child.castShadow = true;
3435
child.receiveShadow = true;
3536
}
3637
});
38+
39+
3740
that.scene.add(object);
3841
that.cube = object;
3942
that.start();

0 commit comments

Comments
 (0)