diff options
| author | J08nY | 2016-04-18 02:12:26 +0200 |
|---|---|---|
| committer | J08nY | 2016-04-18 02:12:26 +0200 |
| commit | 8fe76ad81a5cc9e78905d938c8e4f8b6ce576c75 (patch) | |
| tree | 05ba047f53ab1e87ef821ac0a765bfed167f37bd | |
| parent | a8f5f2d7a98ff13999273e2199e5c744322fa272 (diff) | |
| download | ld35-8fe76ad81a5cc9e78905d938c8e4f8b6ce576c75.tar.gz ld35-8fe76ad81a5cc9e78905d938c8e4f8b6ce576c75.tar.zst ld35-8fe76ad81a5cc9e78905d938c8e4f8b6ce576c75.zip | |
| -rw-r--r-- | help.html | 61 | ||||
| -rw-r--r-- | shader/enemy_shader.frag | 0 | ||||
| -rw-r--r-- | shader/player_shader.frag | 0 | ||||
| -rw-r--r-- | shader/vertex_shader.vert | 10 | ||||
| -rw-r--r-- | shader/world_shader.frag | 0 | ||||
| -rw-r--r-- | test.html | 12 | ||||
| -rw-r--r-- | test_physijs.ts | 60 | ||||
| -rw-r--r-- | ts/Controls.ts | 4 | ||||
| -rw-r--r-- | ts/Enemy.ts | 12 | ||||
| -rw-r--r-- | ts/Morph.ts | 43 | ||||
| -rw-r--r-- | ts/Player.ts | 15 | ||||
| -rw-r--r-- | ts/TargetCamera.ts | 1 | ||||
| -rw-r--r-- | ts/World.ts | 11 | ||||
| -rw-r--r-- | ts/main.ts | 67 |
14 files changed, 0 insertions, 296 deletions
diff --git a/help.html b/help.html deleted file mode 100644 index 7b0405c..0000000 --- a/help.html +++ /dev/null @@ -1,61 +0,0 @@ -<!DOCTYPE html> -<html> - -<head> - <script type="text/javascript" src="/three_js/dist/three.min.js"></script> - <script type="text/javascript" src="/physi_js/physi.js"></script> - - -</head> - -<body> -<div id="viewport"></div> - -<script type="text/javascript"> - - 'use strict'; - - Physijs.scripts.worker = '/physi_js/physijs_worker.js'; - Physijs.scripts.ammo = '/physi_js/ammo.js'; - - var initScene, render, renderer, scene, camera, box; - - initScene = function() { - renderer = new THREE.WebGLRenderer({ antialias: true }); - renderer.setSize( window.innerWidth, window.innerHeight ); - document.getElementById( 'viewport' ).appendChild( renderer.domElement ); - - scene = new Physijs.Scene; - - camera = new THREE.PerspectiveCamera( - 35, - window.innerWidth / window.innerHeight, - 1, - 1000 - ); - camera.position.set( 60, 50, 60 ); - camera.lookAt( scene.position ); - scene.add( camera ); - - // Box - box = new Physijs.BoxMesh( - new THREE.CubeGeometry( 5, 5, 5 ), - new THREE.MeshBasicMaterial({ color: 0x888888 }) - ); - scene.add( box ); - - requestAnimationFrame( render ); - }; - - render = function() { - box.applyCentralForce(new THREE.Vector3(1,0,0)); - scene.simulate(); // run physics - renderer.render( scene, camera); // render the scene - requestAnimationFrame( render ); - }; - - window.onload = initScene(); - -</script> -</body> -</html>
\ No newline at end of file diff --git a/shader/enemy_shader.frag b/shader/enemy_shader.frag deleted file mode 100644 index e69de29..0000000 --- a/shader/enemy_shader.frag +++ /dev/null diff --git a/shader/player_shader.frag b/shader/player_shader.frag deleted file mode 100644 index e69de29..0000000 --- a/shader/player_shader.frag +++ /dev/null diff --git a/shader/vertex_shader.vert b/shader/vertex_shader.vert deleted file mode 100644 index 9a07371..0000000 --- a/shader/vertex_shader.vert +++ /dev/null @@ -1,10 +0,0 @@ - -varying vec3 vWorldPosition; - -void main() { - vec4 worldPosition = modelMatrix * vec4( position, 1.0 ); - vWorldPosition = worldPosition.xyz; - - gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 ); - -} diff --git a/shader/world_shader.frag b/shader/world_shader.frag deleted file mode 100644 index e69de29..0000000 --- a/shader/world_shader.frag +++ /dev/null diff --git a/test.html b/test.html deleted file mode 100644 index b62f17e..0000000 --- a/test.html +++ /dev/null @@ -1,12 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="UTF-8"> - <title>Test</title> - <script type="text/javascript" src="three_js/dist/three.min.js"></script> - <script type="text/javascript" src="physi_js/physi.js"></script> -</head> -<body> - <script type="text/javascript" src="test_physijs.js"></script> -</body> -</html>
\ No newline at end of file diff --git a/test_physijs.ts b/test_physijs.ts deleted file mode 100644 index dc3fd2e..0000000 --- a/test_physijs.ts +++ /dev/null @@ -1,60 +0,0 @@ -///<reference path="three_js/ts/three.d.ts"/> -///<reference path="physi_js/physijs.d.ts"/> - -Physijs.scripts.ammo = "../ammo_js/ammo.js"; -Physijs.scripts.worker = "physi_js/physijs_worker.js"; - -let renderer, camera, scene, box, plane; - -function init() { - renderer = new THREE.WebGLRenderer(); - renderer.setClearColor(0xffffff); - renderer.setSize(window.innerWidth, window.innerHeight); - document.body.appendChild(renderer.domElement); - - scene = new Physijs.Scene; - scene.setGravity(10); - - - scene.addEventListener("update", function () { - scene.simulate(undefined, 1); - }); - - camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 1000); - scene.add(camera); - - let boxMaterial = Physijs.createMaterial(new THREE.MeshLambertMaterial({ - color: 0xaf0000 - })); - - box = new Physijs.BoxMesh( - new THREE.BoxGeometry(4, 4, 4), - boxMaterial, - 1 - ); - box.position.set(0,5,0); - scene.add(box); - - let groundMaterial = Physijs.createMaterial(new THREE.MeshLambertMaterial({ - color: 0xfafafa - })); - - plane = new Physijs.BoxMesh( - new THREE.BoxGeometry(100, 1, 100), - groundMaterial, - 0 - ); - scene.add(plane); - - requestAnimationFrame(render); - scene.simulate(); -} - -function render() { - requestAnimationFrame(render); - box.applyCentralForce(new THREE.Vector3(1, 0, 0)); - renderer.render(scene, camera); -} - -window.onload = init; - diff --git a/ts/Controls.ts b/ts/Controls.ts deleted file mode 100644 index 0c4adef..0000000 --- a/ts/Controls.ts +++ /dev/null @@ -1,4 +0,0 @@ - -module Controls{ - -}
\ No newline at end of file diff --git a/ts/Enemy.ts b/ts/Enemy.ts deleted file mode 100644 index c461941..0000000 --- a/ts/Enemy.ts +++ /dev/null @@ -1,12 +0,0 @@ -/// <reference path="../three_js/ts/three.d.ts"/> -/// <reference path="../physi_js/physijs.d.ts"/> - -import {Morph} from "./Morph"; - -export class Enemy extends Morph { - - constructor() { - super(null, null, null); - //todo - } -}
\ No newline at end of file diff --git a/ts/Morph.ts b/ts/Morph.ts deleted file mode 100644 index f01b7ef..0000000 --- a/ts/Morph.ts +++ /dev/null @@ -1,43 +0,0 @@ -/// <reference path="../three_js/ts/three.d.ts"/> -/// <reference path="../physi_js/physijs.d.ts"/> - -export class Morph extends Physijs.Mesh { - faces:number; - //TODO, probelm s tym ze ked extendujem Mesh, tak sa nedostanem k Geometry ale iba k BufferGeometry - - constructor(numFaces:number, material:THREE.Material, mass:number) { - let geometry = Morph.generateGeometry(numFaces); - super(geometry, material, mass); - } - - static generateGeometry(numFaces:number):THREE.Geometry { - if (numFaces == 4) { - return new THREE.TetrahedronGeometry(); - } else if (numFaces == 6) { - return new THREE.BoxGeometry(1, 1, 1, 2, 2, 2); - } else if (numFaces == 12) { - return new THREE.DodecahedronGeometry(1, 0); - } else if (numFaces == 20) { - return new THREE.IcosahedronGeometry(1, 0); - } - return null; - } - - private updateGeometry(numFaces:number) { - this.faces = numFaces; - this.geometry = Morph.generateGeometry(this.faces); - } - - shrink(numFaces:number):void { - this.updateGeometry(this.faces - numFaces); - } - - grow(numFaces:number):void { - this.updateGeometry(this.faces + numFaces); - } - - wobble():void { - - } - -}
\ No newline at end of file diff --git a/ts/Player.ts b/ts/Player.ts deleted file mode 100644 index a118b64..0000000 --- a/ts/Player.ts +++ /dev/null @@ -1,15 +0,0 @@ -/// <reference path="../three_js/ts/three.d.ts"/> -/// <reference path="../physi_js/physijs.d.ts"/> - -import {Morph} from "./Morph"; - -export class Player extends Morph { - - constructor() { - let mat = new THREE.MeshBasicMaterial({ - color: 0x00b0a0, - shading: THREE.SmoothShading - }); - super(4, mat, 1); - } -}
\ No newline at end of file diff --git a/ts/TargetCamera.ts b/ts/TargetCamera.ts deleted file mode 100644 index 8b13789..0000000 --- a/ts/TargetCamera.ts +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ts/World.ts b/ts/World.ts deleted file mode 100644 index 356aa61..0000000 --- a/ts/World.ts +++ /dev/null @@ -1,11 +0,0 @@ -/// <reference path="../three_js/ts/three.d.ts"/> -/// <reference path="../physi_js/physijs.d.ts"/> - -import {Player} from "./Player"; - -export class World { - - constructor(player: Player, scene:THREE.Scene, camera:THREE.Camera) { - - } -}
\ No newline at end of file diff --git a/ts/main.ts b/ts/main.ts deleted file mode 100644 index b328a3b..0000000 --- a/ts/main.ts +++ /dev/null @@ -1,67 +0,0 @@ -/// <reference path="../three_js/ts/three.d.ts"/> -/// <reference path="../three_js/ts/detector.d.ts"/> - -import {Player} from "./Player"; -import {World} from "./World"; - -export class Game { - renderer:THREE.WebGLRenderer; - scene:THREE.Scene; - camera:THREE.PerspectiveCamera; - player:Player; - world:World; - private ticks:number; - private running:boolean; - - constructor() { - this.renderer = new THREE.WebGLRenderer({ - antialias: true - }); - this.renderer.setClearColor(0xffffff); - this.renderer.setPixelRatio(window.devicePixelRatio); - this.renderer.setSize(window.innerWidth, window.innerHeight); - document.body.appendChild(this.renderer.domElement); - - this.scene = new THREE.Scene(); - this.camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 1, 1000); - } - - init():void { - //init world - this.player = new Player(); - this.world = new World(this.player, this.scene, this.camera); - //init camera - - } - - render():void { - this.renderer.render(this.scene, this.camera); - } - - tick():void { - this.ticks++; - - } - - run():void { - this.running = true; - while (this.running) { - this.tick(); - let shouldRender = true; - if (shouldRender) { - this.render(); - } - } - } - -} - -if (!Detector.webgl) { - Detector.addGetWebGLMessage(); -} - -window.onload = () => { - var game = new Game(); - game.init(); - game.run(); -};
\ No newline at end of file |