Comparing version 0.2.1 to 0.2.2
@@ -49,8 +49,8 @@ const path = require('path'); | ||
const content = fs.readFileSync(`${docDir}/${scope}/${k}.md`, 'utf-8'); | ||
console.log(docDir, scope, k); | ||
const content = fs.readFileSync(`${docDir}/${scope}/${k}.md`, 'utf-8') || ' '; | ||
const contentcn = fs.existsSync(`${docDir}/${scope}/${k}.cn.md`) ? | ||
fs.readFileSync(`${docDir}/${scope}/${k}.cn.md`, 'utf-8') : content; | ||
console.log(docDir, scope, k); | ||
if (content) { | ||
@@ -57,0 +57,0 @@ |
{ | ||
"name": "g3d", | ||
"version": "0.2.1", | ||
"version": "0.2.2", | ||
"description": "webgl render engine compatible with both browser and gcanvas", | ||
@@ -5,0 +5,0 @@ "main": "dist/g3d.min.js", |
@@ -6,4 +6,2 @@ import GL from './G3D.GL'; | ||
import * as fShaderMaterialPhong from '../shaders/material-phong.frag.glsl'; | ||
@@ -31,2 +29,3 @@ import * as vShaderMaterialPhong from '../shaders/material-phong.vert.glsl'; | ||
import { ICanvas, IWebGLRenderingContext } from '../types/webgl'; | ||
import Scene from '../scene/G3D.Scene'; | ||
@@ -40,2 +39,3 @@ | ||
currentProgram: any = {}; | ||
currentScene: Scene; | ||
@@ -42,0 +42,0 @@ programs: { [prop: string]: Program } = {}; |
@@ -1,2 +0,1 @@ | ||
declare module '*.glsl'; |
@@ -25,2 +25,3 @@ import Env from '../core/G3D.Env'; | ||
this.engine = engine; | ||
this.engine.currentScene = this; | ||
} | ||
@@ -27,0 +28,0 @@ |
@@ -10,3 +10,3 @@ import Geometry from '../geometry/G3D.Geometry'; | ||
constructor(scene, faceImages, size = 100) { | ||
constructor(scene, images, size = 100) { | ||
@@ -72,8 +72,8 @@ scene.skybox = this; | ||
images: { | ||
front: faceImages.front, | ||
back: faceImages.back, | ||
left: faceImages.left, | ||
right: faceImages.right, | ||
top: faceImages.top, | ||
bottom: faceImages.bottom | ||
front: images.front, | ||
back: images.back, | ||
left: images.left, | ||
right: images.right, | ||
top: images.top, | ||
bottom: images.bottom | ||
} | ||
@@ -80,0 +80,0 @@ }); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
396746
7143