Skip to content

Commit

Permalink
Editmode.html fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@onedayitwillmake
onedayitwillmake committed Oct 26, 2011
1 parent e4fe7ed commit 3e9e582
Show file tree
Hide file tree
Showing 4 changed files with 121 additions and 114 deletions.
220 changes: 109 additions & 111 deletions editmode.html
View file
Expand Up @@ -6,111 +6,112 @@
<meta charset="utf-8"/>
<title>ChuClone</title>

<script type='text/javascript' src='/game/js/lib/DAT.GUI.js'></script>
<script type='text/javascript' src='/game/js/lib/Stats.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/build/Three.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/RequestAnimationFrame.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/Stats.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/Detector.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/postprocessing/BloomPass.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/postprocessing/DotScreenPass.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/postprocessing/EffectComposer.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/postprocessing/FilmPass.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/postprocessing/MaskPass.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/postprocessing/RenderPass.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/postprocessing/ShaderPass.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/postprocessing/TexturePass.js'></script>
<script type='text/javascript' src='/game/js/lib/threejs/examples/js/ShaderExtras.js'></script>
<script type='text/javascript' src='/game/js/lib/Tween.js'></script>

<script type='text/javascript' src='/game/assets/geometry/Bird.js'></script>

<script type='text/javascript' src='/game/js/lib/Box2DWeb.js'></script>
<script type='text/javascript' src='/game/js/lib/EventEmitter.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/namespace.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/model/Constants.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/model/LineSegment.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/model/AchievementTracker.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/model/AnalyticsTracker.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/controller/AudioController.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/Utils.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/utils/TextureUtils.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/utils/StyleMemoizer.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/gui/LevelListing.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/gui/HUDController.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/gui/LevelRecap.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/gui/TutorialNoteDisplay.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/GameEntity.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/components/BaseComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/JumpPadComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/FrictionPadComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/MovingPlatformComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/RespawnPointComponent.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/components/GoalPadComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/DeathPadComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/AutoRotationComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/TiltComponent.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/components/effect/ParticleEmitterComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/effect/BirdEmitterComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/effect/MotionStreakComponent.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/components/player/CharacterControllerComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/player/CheckIsJumpingComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/player/KeyboardInputComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/player/PlayerRecordComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/player/PlayerPlaybackComponent.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/components/portal/PortalComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/portal/AntiPortalWallComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/portal/PortalGunComponent.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/components/AntiPhysicsVelocityLimitComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/PhysicsVelocityLimitComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/BoundsYCheckComponent.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/components/camera/CameraFocusRadiusComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/camera/CameraFollowEditorComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/camera/CameraFollowPlayerComponent.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/components/camera/CameraOrbitRadiusComponent.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/components/misc/TutorialNoteComponent.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/components/ComponentFactory.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/model/FSM/State.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/model/FSM/StateMachine.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/Dispatcher.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/editor/LevelModel.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/editor/LevelManager.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/editor/CameraGUI.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/editor/PlayerGUI.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/editor/ShiftDragHelper.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/editor/WorldEditor.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/editor/ComponentGUI.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/physics/ContactListener.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/physics/DestructionListener.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/physics/WorldController.js'></script>

<script type='text/javascript' src='/game/js/ChuClone/GameViewController.js'></script>


<script type='text/javascript' src='/game/js/ChuClone/states/ChuCloneBaseState.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/states/EditState.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/states/EndLevelState.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/states/PlayLevelState.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/states/TitleScreenState.js'></script>
<script type='text/javascript' src='/game/js/ChuClone/ChuCloneGame.js'></script>
<script type='text/javascript' src='js/lib/DAT.GUI.js'></script>
<script type='text/javascript' src='js/lib/Stats.js'></script>
<script type='text/javascript' src='js/lib/threejs/build/Three.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/RequestAnimationFrame.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/Stats.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/Detector.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/postprocessing/BloomPass.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/postprocessing/DotScreenPass.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/postprocessing/EffectComposer.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/postprocessing/FilmPass.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/postprocessing/MaskPass.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/postprocessing/RenderPass.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/postprocessing/ShaderPass.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/postprocessing/TexturePass.js'></script>
<script type='text/javascript' src='js/lib/threejs/examples/js/ShaderExtras.js'></script>
<script type='text/javascript' src='js/lib/Tween.js'></script>

<script type='text/javascript' src='assets/geometry/Bird.js'></script>

<script type='text/javascript' src='js/lib/Box2DWeb.js'></script>
<script type='text/javascript' src='js/lib/EventEmitter.js'></script>

<script type='text/javascript' src='js/ChuClone/namespace.js'></script>
<script type='text/javascript' src='js/ChuClone/model/Constants.js'></script>
<script type='text/javascript' src='js/ChuClone/model/LineSegment.js'></script>
<script type='text/javascript' src='js/ChuClone/model/AchievementTracker.js'></script>
<script type='text/javascript' src='js/ChuClone/model/AnalyticsTracker.js'></script>

<script type='text/javascript' src='js/ChuClone/controller/AudioController.js'></script>

<script type='text/javascript' src='js/ChuClone/Utils.js'></script>
<script type='text/javascript' src='js/ChuClone/utils/TextureUtils.js'></script>
<script type='text/javascript' src='js/ChuClone/utils/StyleMemoizer.js'></script>

<script type='text/javascript' src='js/ChuClone/gui/LevelListing.js'></script>
<script type='text/javascript' src='js/ChuClone/gui/HUDController.js'></script>
<script type='text/javascript' src='js/ChuClone/gui/LevelRecap.js'></script>
<script type='text/javascript' src='js/ChuClone/gui/TutorialNoteDisplay.js'></script>

<script type='text/javascript' src='js/ChuClone/GameEntity.js'></script>

<script type='text/javascript' src='js/ChuClone/components/BaseComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/JumpPadComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/FrictionPadComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/MovingPlatformComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/RespawnPointComponent.js'></script>

<script type='text/javascript' src='js/ChuClone/components/GoalPadComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/DeathPadComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/AutoRotationComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/TiltComponent.js'></script>

<script type='text/javascript' src='js/ChuClone/components/effect/ParticleEmitterComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/effect/BirdEmitterComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/effect/MotionStreakComponent.js'></script>

<script type='text/javascript' src='js/ChuClone/components/player/CharacterControllerComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/player/CheckIsJumpingComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/player/KeyboardInputComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/player/PlayerRecordComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/player/PlayerPlaybackComponent.js'></script>

<script type='text/javascript' src='js/ChuClone/components/portal/PortalComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/portal/AntiPortalWallComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/portal/PortalGunComponent.js'></script>

<script type='text/javascript' src='js/ChuClone/components/AntiPhysicsVelocityLimitComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/PhysicsVelocityLimitComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/BoundsYCheckComponent.js'></script>

<script type='text/javascript' src='js/ChuClone/components/camera/CameraFocusRadiusComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/camera/CameraFollowEditorComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/camera/CameraFollowPlayerComponent.js'></script>
<script type='text/javascript' src='js/ChuClone/components/camera/CameraOrbitRadiusComponent.js'></script>

<script type='text/javascript' src='js/ChuClone/components/misc/TutorialNoteComponent.js'></script>

<script type='text/javascript' src='js/ChuClone/components/ComponentFactory.js'></script>

<script type='text/javascript' src='js/ChuClone/model/FSM/State.js'></script>
<script type='text/javascript' src='js/ChuClone/model/FSM/StateMachine.js'></script>

<script type='text/javascript' src='js/ChuClone/Dispatcher.js'></script>

<script type='text/javascript' src='js/ChuClone/editor/LevelModel.js'></script>
<script type='text/javascript' src='js/ChuClone/editor/LevelManager.js'></script>
<script type='text/javascript' src='js/ChuClone/editor/CameraGUI.js'></script>
<script type='text/javascript' src='js/ChuClone/editor/PlayerGUI.js'></script>
<script type='text/javascript' src='js/ChuClone/editor/ShiftDragHelper.js'></script>
<script type='text/javascript' src='js/ChuClone/editor/WorldEditor.js'></script>
<script type='text/javascript' src='js/ChuClone/editor/ComponentGUI.js'></script>

<script type='text/javascript' src='js/ChuClone/physics/ContactListener.js'></script>
<script type='text/javascript' src='js/ChuClone/physics/DestructionListener.js'></script>
<script type='text/javascript' src='js/ChuClone/physics/WorldController.js'></script>

<script type='text/javascript' src='js/ChuClone/GameViewController.js'></script>


<script type='text/javascript' src='js/ChuClone/states/ChuCloneBaseState.js'></script>
<script type='text/javascript' src='js/ChuClone/states/EditState.js'></script>
<script type='text/javascript' src='js/ChuClone/states/EndLevelState.js'></script>
<script type='text/javascript' src='js/ChuClone/states/PlayLevelState.js'></script>
<script type='text/javascript' src='js/ChuClone/states/TitleScreenState.js'></script>
<script type='text/javascript' src='js/ChuClone/ChuCloneGame.js'></script>



<!--MINIFIED VERSION-->
Expand All @@ -128,10 +129,7 @@
<link rel="stylesheet" href="assets/css/960/reset.css"/>
<link rel="stylesheet" href="assets/css/960/text.css"/>
<link rel="stylesheet" href="assets/css/960/960.css"/>
<link href="/stylesheets/ChuClone.css?1314651528" media="screen" rel="stylesheet" type="text/css" />



<link href="stylesheets/ChuClone.css?1314651528" media="screen" rel="stylesheet" type="text/css" />
<link href="http://fonts.googleapis.com/css?family=Jura:300,400,500,600&v1" rel="stylesheet" type="text/css">
</head>
<body>
Expand All @@ -141,8 +139,8 @@
<div class="flash_notice" id="flash_notice">
<a href="/EditMode">Notices:</a>
</div>
<div id="gameContainer" class="push_1 grid_12" style="width:800px; height:400px;"></div>
<div id="editorContainer" class="push_1 grid_12" style="width:800px; height: 400px;"></div>
<div id="gameContainer" class="push_1 grid_12" style="width:800px; height:400px; border: 1px solid gray"></div>
<div id="editorContainer" class="push_1 grid_12" style="width:800px; height: 400px; border: 1px solid gray"></div>

<div class="grid_4 push_1 lineBorder" id="HUDTime" style="margin-left:10px">00.0 secs</div>
<div class="jura_36 grid_4"><p class="grayBorder push_1" id="levelName"> Level Name </p></div>
Expand Down
9 changes: 9 additions & 0 deletions index.htm
View file
Expand Up @@ -135,6 +135,15 @@
// Access the page with a 'level' parameter in the query string to change the level
// "localhost:8889/chuclone/index.html?level=assets/levels/Intro.json"
var game = new ChuClone.ChuCloneGame( getQuerystring("level", "assets/levels/ChuChinko.json") );

window.addEventListener('DOMContentLoaded', function callback(e){
window.removeEventListener('DOMContentLoaded', callback, false);
game._gameView.setFullscreen( true, false );
}, false);

// game._gameView.setFullscreen( true, true );
// document.addEvent
// console.log( game );
</script>
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions js/ChuClone/editor/CameraGUI.js
View file
Expand Up @@ -95,8 +95,8 @@


this.setupFullscreenToggle();
this._gui.close();
//this._gui.open();
this._gui.close();
this._gui.open();
},

/**
Expand Down
2 changes: 1 addition & 1 deletion js/ChuClone/editor/PlayerGUI.js
View file
Expand Up @@ -60,7 +60,7 @@
that.togglePortalGun();
})
this._gui.close();
//this._gui.open();
this._gui.open();
},


Expand Down

0 comments on commit 3e9e582

Please sign in to comment.