Merge pull request #10 from Johnsmith0508/online-count

add count of ppl online
Johnsmith0508 · Dec 9, 2015 · 337e4c2 · 337e4c2
2 parents fa9e76d + 0744e15
commit 337e4c2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/app.js b/app.js
@@ -23,6 +23,7 @@ app.get('/', function(req, res) {
 
 io.on('connection', function(socket) {
 	var userName = "";
+	socket.emit('user count',Object.size(User));
 	socket.on('create user',function(user){
 		console.log(user.name+" joined");
 		userName = user.name;

diff --git a/client.js b/client.js
@@ -65,9 +65,9 @@ var carGeometry, carMaterial;
 //define vars for enviroment
 var floorMaterial, wallsMaterial, light;
 //create socket.io connection to server
-var socket /*= new io('//dynalogic.org', {
+var socket = new io('//dynalogic.org', {
 	path: '/node/socket.io'
-})*/;
+});
 //initiate stats.js
 var stats = new Stats();
 //object that tracks keys
@@ -207,6 +207,12 @@ function animate() {
 	requestAnimationFrame(animate);
 	renderer.render(scene, camera);
 }
+
+//does the 'players online' bit
+socket.on('user count',function(users) {
+	console.log(users);
+	$("#usersOnline").text(users+" online currently");
+});
 var registerEvents = function() {
 //called when a user joins the server
 socket.on('user joined', function(data) {
@@ -246,8 +252,8 @@ socket.on('position changed', function(data) {
 		//console.log('moved');
 	}
 });
-//handles the sending of keys to the server
 }
+//handles the sending of keys to the server
 var buttonHandler = function(keyPressed, status) {
 	if (keyPressed.target == $(".chat")) return;
 	//console.log("key was pressed"+ keyPressed);
@@ -303,14 +309,10 @@ var mainLoop = function() {
 //handles the logic behind the submit button on the login screen
 var submitHandler = function(e) {
 	//console.log("submited");
-	var path = $("#server").val().substring($("#server").val().indexOf("/",3),$("#server").val().length);
-	var server = $("#server").val().substring(0,$("#server").val().indexOf("/",3));
-	socket = new io(server,{path:path+"/socket.io"});
 	$('#name').off('keyup');
 	registerEvents();
 	registerChatSocket();
 	if ($("#name").val().length > 0) {
-		socket = new io()
 		modelType = $(".model:checked").val();
 		socket.emit('create user', {
 			name: $("#name").val(),
@@ -369,6 +371,7 @@ init();
 animate();
 //toggles hiding/showing options pannel
 $(function() {
+	$("#server").val(defaultServer);
 	$("#opts").on('click', function() {
 		$("#options").toggle();
 	});

diff --git a/index.html b/index.html
@@ -10,18 +10,21 @@
 	<script src="//cdnjs.cloudflare.com/ajax/libs/cannon.js/0.6.2/cannon.min.js"></script>
 	<script src="/node/fonts/helvetiker_regular.typface.js"></script>
 	<script src="/nodde/fonts/helvetiker_bold.typeface.js"></script>
+	<script src="./config.js"></script>
 	<script src="/node/socket.io/socket.io.js"></script>
 	<script src="/js/MTLLoader.js"></script>
 	<script src="/js/OBJLoader.js"></script>
 	<script src="/js/OBJMTLLoader.js"></script>
-	<script src="/js/cannon.js"></script>
+	<script src="./js/cannon.js"></script>
 </head>
 
 <body>
 	<p id="ErrorMsg" hidden>Error #{error code}, please report to the developer</p>
 	<a href="//github.com/johnsmith0508/cubes" class="github-corner"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#fff; color:#151513; position: absolute; top: 0; border: 0; right: 0;"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
 	<div id="login">
 		<h1>Enter a user name</h1>
+		<p id="usersOnline"></p>
+		<br />
 		<input id="name" type="text" defaultValue="name" />
 		<input id="sendName" type="submit" />
 		<input id="opts" type="button" value="Options" />
@@ -32,8 +35,6 @@ <h1>Enter a user name</h1>
 			<br />
 			<input class="model" type="radio" name="type" value="car">Car</input>
 			<input class="model" type="radio" name="type" value="cube" checked="checked">Cube</input>
-			<br />
-			<input id="server" type="text" value="//dynalogic.org/node">Custom Server</input>
 		</div>
 	</div>
 	<div id="main_window" hidden>

diff --git a/stylesheet.css b/stylesheet.css
@@ -1,3 +1,6 @@
+body {
+	overflow: hidden;
+}
 div.chat {
 position: absolute;
 right: 0px;