Skip to content

Commit

Permalink
Merge pull request #669 from redcamel/dev
Browse files Browse the repository at this point in the history 
릴리즈준비
  • Loading branch information
@redcamel
redcamel authored Jul 9, 2019
2 parents 5d614e0 + 703e3f0 commit 3b184b3
Show file tree
Hide file tree
Showing 137 changed files with 1,395 additions and 1,916 deletions.
6 changes: 5 additions & 1 deletion example/baseTestUI.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* RedGL - MIT License
* Copyright (c) 2018 - 2019 By RedCamel([email protected])
* https://github.com/redcamel/RedGL2/blob/dev/LICENSE
* Last modification time of this file - 2019.6.5 11:37
* Last modification time of this file - 2019.7.5 11:56
*/

var baseTestUI = function (redGL, width) {
Expand Down Expand Up @@ -248,6 +248,10 @@ baseTestUI.exampleList = [
{
key: 'object3D lookAt',
href: 'object3D/object3D_lookAt.html'
},
{
key: 'object3D pivotTest',
href: 'object3D/pivotTest.html'
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions example/camera/RedBasicController.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:5
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -46,7 +46,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tWorld.addView(RedView('test', this, tScene, tController));
tWorld.addView(RedView(this, tScene, tController));
// 그리드 설정
tScene['grid'] = RedGrid(this)
// axis 설정
Expand Down
16 changes: 8 additions & 8 deletions example/camera/RedBasicController_targetView.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:16
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -50,13 +50,13 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tWorld.addView(RedView('test', this, tScene, tController));
tWorld.addView(RedView('test2', this, tScene, tController2));
RedView('test').setSize('50%', '100%')
RedView('test2').setSize('50%', '100%')
RedView('test2').setLocation('50%', 0)
tController['targetView'] = RedView('test');
tController2['targetView'] = RedView('test2');
tWorld.addView(RedView(this, tScene, tController),'test');
tWorld.addView(RedView(this, tScene, tController2),'test2');
tWorld.getView('test').setSize('50%', '100%')
tWorld.getView('test2').setSize('50%', '100%')
tWorld.getView('test2').setLocation('50%', 0)
tController['targetView'] = tWorld.getView('test');
tController2['targetView'] = tWorld.getView('test2');
// 그리드 설정
tScene['grid'] = RedGrid(this)
// axis 설정
Expand Down
4 changes: 2 additions & 2 deletions example/camera/RedCamera.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -47,7 +47,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', redGL, tScene, tCamera);
tView = RedView(redGL, tScene, tCamera);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(redGL);
Expand Down
4 changes: 2 additions & 2 deletions example/camera/RedCamera_mode2D.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.20 20:27
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -66,7 +66,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', redGL, tScene, tCamera);
tView = RedView(redGL, tScene, tCamera);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(redGL);
Expand Down
4 changes: 2 additions & 2 deletions example/camera/RedObitController.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -46,7 +46,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tWorld.addView(RedView('test', this, tScene, tController));
tWorld.addView(RedView(this, tScene, tController));
// 그리드 설정
tScene['grid'] = RedGrid(this)
// axis 설정
Expand Down
16 changes: 8 additions & 8 deletions example/camera/RedObitController_targetView.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:17
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -49,13 +49,13 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tWorld.addView(RedView('test', this, tScene, tController));
tWorld.addView(RedView('test2', this, tScene, tController2));
RedView('test').setSize('50%', '100%')
RedView('test2').setSize('50%', '100%')
RedView('test2').setLocation('50%', 0)
tController['targetView'] = RedView('test');
tController2['targetView'] = RedView('test2');
tWorld.addView(RedView(this, tScene, tController), 'test');
tWorld.addView(RedView(this, tScene, tController2), 'test2');
tWorld.getView('test').setSize('50%', '100%')
tWorld.getView('test2').setSize('50%', '100%')
tWorld.getView('test2').setLocation('50%', 0)
tController['targetView'] = tWorld.getView('test');
tController2['targetView'] = tWorld.getView('test2');
// 그리드 설정
tScene['grid'] = RedGrid(this)
// axis 설정
Expand Down
4 changes: 2 additions & 2 deletions example/etc/Fog_example.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -47,7 +47,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', redGL, tScene, tController);
tView = RedView(redGL, tScene, tController);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(redGL);
Expand Down
4 changes: 2 additions & 2 deletions example/etc/LOD_example.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.21 16:9
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -47,7 +47,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', redGL, tScene, tController);
tView = RedView(redGL, tScene, tController);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(redGL);
Expand Down
4 changes: 2 additions & 2 deletions example/etc/RedBoxSelection.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.6.4 17:20
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -57,7 +57,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', redGL, tScene, tController);
tView = RedView(redGL, tScene, tController);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(redGL);
Expand Down
4 changes: 2 additions & 2 deletions example/etc/RedGL.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -46,7 +46,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', this, tScene, tController);
tView = RedView(this, tScene, tController);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(this);
Expand Down
4 changes: 2 additions & 2 deletions example/etc/RedScene.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -46,7 +46,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', this, tScene, tController);
tView = RedView(this, tScene, tController);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(this);
Expand Down
8 changes: 4 additions & 4 deletions example/etc/RedView.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:4
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -50,13 +50,13 @@
tScene2.backgroundColor = '#010c20'
tScene3.backgroundColor = '#3e0946'
// 뷰생성 및 적용
tView = RedView('HelloRedGL', this, tScene, tController);
tView = RedView(this, tScene, tController);
tView.setSize('50%', '100%');
tView.setLocation(0, 0);
tView2 = RedView('HelloRedGL2', this, tScene2, tController);
tView2 = RedView(this, tScene2, tController);
tView2.setSize('50%', '100%');
tView2.setLocation('50%', 0);
tView3 = RedView('HelloRedGL3', this, tScene3, tController);
tView3 = RedView(this, tScene3, tController);
tView3.setSize('20%', '20%');
tView3.setLocation('40%', '40%');
tWorld.addView(tView);
Expand Down
14 changes: 7 additions & 7 deletions example/etc/calPoint.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:33
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -47,8 +47,8 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', redGL, tScene, tController);
tWorld.addView(tView);
tView = RedView(redGL, tScene, tController);
tWorld.addView(tView, 'HelloRedGL');
// 그리드 설정
tScene['grid'] = RedGrid(redGL);
tScene['axis'] = RedAxis(redGL)
Expand Down Expand Up @@ -124,19 +124,19 @@
testMesh2.rotationY += 0.2
testMesh2.rotationZ += 0.2
////////////////////////////////////////////////////////////////////////////////////
var testPoint = testMesh.getScreenPoint(RedView('HelloRedGL'))
var testPoint = testMesh.getScreenPoint(tWorld.getView('HelloRedGL'))
getScreenPointBox.style.top = testPoint[1] + 'px'
getScreenPointBox.style.left = testPoint[0] + 'px'
getScreenPointBox.innerHTML = 'testMesh / getScreenPointBox Test<br>screen X : ' + testPoint[0] + '<br>' + 'screen Y : ' + testPoint[1]
////////////////////////////////////////////////////////////////////////////////////
var testPoint2 = testMesh2.getScreenPoint(RedView('HelloRedGL'))
var testPoint2 = testMesh2.getScreenPoint(tWorld.getView('HelloRedGL'))
getScreenPointBox2.style.top = testPoint2[1] + 'px'
getScreenPointBox2.style.left = testPoint2[0] + 'px'
getScreenPointBox2.innerHTML = 'testMesh2 / getScreenPointBox2 Test<br>screen X : ' + testPoint2[0] + '<br>' + 'screen Y : ' + testPoint2[1]
////////////////////////////////////////////////////////////////////////////////////
var testLocalInput3 = [-1, 1, 0]
var testLocalToWorld3 = testMesh2.localToWorld(testLocalInput3[0], testLocalInput3[1], testLocalInput3[2])
var testPoint3 = testMesh3.getScreenPoint(RedView('HelloRedGL'))
var testPoint3 = testMesh3.getScreenPoint(tWorld.getView('HelloRedGL'))
testMesh3.x = testLocalToWorld3[0]
testMesh3.y = testLocalToWorld3[1]
testMesh3.z = testLocalToWorld3[2]
Expand All @@ -148,7 +148,7 @@
////////////////////////////////////////////////////////////////////////////////////
var testWolrdInput4 = [3, 0, 1]
var testWorldToLocal4 = testMesh4.worldToLocal(testWolrdInput4[0], testWolrdInput4[1], testWolrdInput4[2])
var testPoint4 = testMesh4.getScreenPoint(RedView('HelloRedGL'))
var testPoint4 = testMesh4.getScreenPoint(tWorld.getView('HelloRedGL'))
testMesh4.x = testWorldToLocal4[0]
testMesh4.y = testWorldToLocal4[1]
testMesh4.z = testWorldToLocal4[2]
Expand Down
4 changes: 2 additions & 2 deletions example/etc/multiRedGLInstance.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:9
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -63,7 +63,7 @@
// 렌더러 생성

// 뷰생성 및 적용
tView = RedView('HelloRedGL' + index, redGL, tScene, tController);
tView = RedView(redGL, tScene, tController);

tWorld.addView(tView);
// 그리드 설정
Expand Down
4 changes: 2 additions & 2 deletions example/etc/normalTest.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -47,7 +47,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', redGL, tScene, tController);
tView = RedView(redGL, tScene, tController);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(redGL);
Expand Down
4 changes: 2 additions & 2 deletions example/etc/screenToWorld.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -48,7 +48,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', redGL, tScene, tController);
tView = RedView(redGL, tScene, tController);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(redGL);
Expand Down
4 changes: 2 additions & 2 deletions example/etc/uvTest.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
~ RedGL - MIT License
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
~ Last modification time of this file - 2019.5.15 16:50
~ Last modification time of this file - 2019.7.8 15:8
-->

<!DOCTYPE html>
Expand Down Expand Up @@ -47,7 +47,7 @@
// 렌더러 생성
tRenderer = RedRenderer();
// 뷰생성 및 적용
tView = RedView('HelloRedGL', redGL, tScene, tController);
tView = RedView(redGL, tScene, tController);
tWorld.addView(tView);
// 그리드 설정
tScene['grid'] = RedGrid(redGL);
Expand Down
Loading

0 comments on commit 3b184b3

Please sign in to comment.