Skip to content

Commit 8a598a3

Browse files
PANSTER.DanielPANSTER.Daniel
authored andcommitted
about changes
1 parent 067d464 commit 8a598a3

File tree

6 files changed

+41
-13
lines changed

6 files changed

+41
-13
lines changed

src/app/app.component.html

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
2-
31
<div class="w3-sidebar w3-bar-block w3-black w3-top" style="z-index:3;width:10%;">
42
<div class="w3-container w3-display-container w3-padding-16">
5-
<h3><b>3D Test</b></h3>
3+
<h3>
4+
<b>3D Test</b>
5+
</h3>
66
</div>
7+
<code>
78
<a routerLink="" class="w3-bar-item w3-button">About</a>
89
<a routerLink="cube-threejs" class="w3-bar-item w3-button">Cube - Three.js</a>
910
<a routerLink="css3d-threejs" class="w3-bar-item w3-button">CSS3D - Three.js</a>
10-
</div>
11+
</code>
12+
</div>
13+
1114

1215
<div style="margin-left:10%;">
1316
<router-outlet></router-outlet>
14-
</div>
17+
</div>

src/app/css3d-threejs/src/main.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ import * as Cannon from 'cannon';
99

1010
enum Texture {
1111
BRICK = "assets/texture/Bricks.jpg",
12-
EARTH = "./../../../assets/texture/earthmap.png",
1312
GAS_BRIGHT = "assets/texture/Gaseous_Bright.jpg",
14-
GAS_DARK = "./../../../assets/texture/Gaseous_Dark.png",
15-
GAS_GREEN = "./../../../assets/texture/Gaseous_Green.jpg",
16-
MOON_BW = "./../../../assets/texture/Moon_BW.jpg",
13+
GAS_DARK = "assets/texture/Gaseous_Dark.png",
14+
GAS_GREEN = "assets/texture/Gaseous_Green.jpg",
15+
MOON_BW = "assets/texture/Moon_BW.jpg",
1716
}
1817

1918
export class MainCSS3d {

src/app/cube-threejs/cube-threejs.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export class CubeThreejsComponent implements OnInit{
187187
let geometry = new THREE.BoxGeometry(this.size, this.size, this.size);
188188
//let geometry = new THREE.IcosahedronGeometry(1, 1);
189189

190-
this._texture_brick = new THREE.TextureLoader().load( "./../../assets/texture/Bricks.jpg" );
190+
this._texture_brick = new THREE.TextureLoader().load( "/assets/texture/Bricks.jpg" );
191191
this._texture_brick.minFilter = THREE.LinearFilter;
192192
// check to set texture or pure color
193193
var matProps:any = {};

src/app/home/home.component.html

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1-
<p>
2-
home works! 2
3-
</p>
1+
<!-- wrap w3 -->
2+
<div class="w3-container">
3+
<header>
4+
<div class="w3-container ">
5+
<h1>
6+
<b>3D showcase examples set up on Angular 5, Three.js</b>
7+
</h1>
8+
Currently there is an example with rotating cubes and an example with a terrain, CSS3D and pysics developed.
9+
<br> A small game included most features of the examples will be implemented...
10+
<br>
11+
</div>
12+
13+
</header>
14+
<div class="w3-container">
15+
<p>
16+
<b>Note: This page is not responsive for mobile screens yet.</b>
17+
</p>
18+
</div>
19+
<ul>
20+
<li>Cube - Three.js</li>
21+
<a routerLink="cube-threejs">
22+
<img src="/assets/screens/cube_threejs.jpg" alt="" height="150" width="150">
23+
</a>
24+
<li>CSS3D - Three.js</li>
25+
<a routerLink="css3d-threejs">
26+
<img src="/assets/screens/css3d_threejs.jpg" alt="" height="150" width="150">
27+
</a>
28+
</ul>
29+
</div>

src/assets/screens/css3d_threejs.jpg

32.9 KB
Loading

src/assets/screens/cube_threejs.jpg

27.9 KB
Loading

0 commit comments

Comments
 (0)