From acfd499cfbb2478b1063b2f26795cf713d8e9ae2 Mon Sep 17 00:00:00 2001
From: andreja6 <andrejaandjic@hotmail.com>
Date: Wed, 18 Apr 2018 19:56:48 -0700
Subject: [PATCH] GO BUTTON TEXTURE!

YES!
---
 G3DTest.suo          | Bin 14336 -> 14848 bytes
 PhysicalInstance.cpp |   2 ++
 main.cpp             |  48 ++++++++++++++++++++++++++++++++++---------
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/G3DTest.suo b/G3DTest.suo
index f7e4e0cf04b508a0a0a5bc27b5ad5a73f2e33c95..e4a1d0d773efea43e76344d6595f9c391b56b536 100644
GIT binary patch
delta 734
zcma)3L2DC16n<|qv)OI7Nt3KeqqS+RMQx02ZL|tn3hF_LCPEMOASkFHR`IZ6jZuUC
z0qFxz9=&-{_vpbwkD^8@h=QPa6H$-|=92ZzuAv@0xbW?K-#2gG%zLkKx#2!KC3-gi
zK*#s}oL(OvCtQ+c9HwEJkAJ-Ae7O2{6(hX0oTr*ROe?WTnvjxy$+DSbn-BVQcVz35
zC23K;k!RTRs>UqZXPKR2EHdbR^kD89lN#eXqt3X&xXI{v?dTC<VV-$69l1SC)z5}Q
ziKzm)v8s}+%s{nR=|D>>&$TN^EB5{;@mJ#3=g0}{(P=ITz}&RMX8<tL*mLr<8SvmI
z*0=#2hyWIE=xCeq;$bQEz4Oi2{wnKtjM2Y**aZ_%guSp64(J{ng)6WCE}RECmi%d8
zFMBclHY3gKsi0aaXq?g)l&GD0Zt9J0tx6Yu+iRzlASW}c>je6`Zp>TA%nPM^pA8Ca
z^;aW`i-XN!-2+Wjie)sEgL5_xYD%rKN-!t4P%&_TBQ}NS3qMfadoc5fz7+Ry=$0Mt
z|MX!9sn026ot|Yj5=|B<kxfv2Thdz|zauTwJ?TEyb4yK>fr?LUCwDhr!EFK~yqP5o
xu^b7cJ3WU&Gy4L2FB$ry<oYZX#^+}M((r!+gSCN$Il%nqlSlh>VtQRV^cyRow*3GA

delta 562
zcmYLF%}X0W6n`^2v-#LnqZ^VeNYpB{G}?S9RYZ#t4;7R|SW0^+w0N<!NDg}_f)Mm9
zw0SxDFDTXh2MYBjiegWC@$6Cdpcm6Ovq}fv@cVf4-kaC-n~h(exc$)SbX2$iaIn&5
zEwRLMI3xzTuN$u0y0~BlIgrN<v4~Z-j3puPPAtXqq|&<%{uqAIN(lTe{|Z$osGD=l
zR?gGG-PpoUZ}2c)<tA`?7RR3P0{Y1_DTpN_X4UaXlrXgFGDd1bsey0Tn8{S35zWJ{
zD?V)*A6QZ~U+2JfE_0L(z>Mb9$9Hj!^~L{VGg4CwQ|ZZIuGe5DbdhGMnx>-=;6|VR
zpG*@Kc;9y{2MP766gfa>Ke%@!M=z6WW!?l{rorVilC#lVxw;`$8(UMq|BT5YqUng{
zJsaP;qZq!dan_I4coF?V4gZL85EgEk=sw?C#hbAi@}9rC#J!?}Cu3R6PQ9P4Kn1E4
z^Ar`>q?+XlfCJye;}X8m654AP8PO7!KPNO+SMa;IEp!`yf+kYmaMVQTzpk0Uh)PXE
VqI%22kvr)zLm~SsrJPcz^AFjkm&*VE

diff --git a/PhysicalInstance.cpp b/PhysicalInstance.cpp
index ba022a0..5b3a068 100644
--- a/PhysicalInstance.cpp
+++ b/PhysicalInstance.cpp
@@ -26,3 +26,5 @@ PhysicalInstance::~PhysicalInstance(void)
 }
 
 
+
+
diff --git a/main.cpp b/main.cpp
index 6ec16b6..c466bd3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -380,7 +380,7 @@ void Demo::onGraphics(RenderDevice* rd) {
 
 		app->renderDevice->setAmbientLightColor(Color3(1,1,1));
 		Draw::axes(CoordinateFrame(Vector3(0, 0, 0)), app->renderDevice);
-
+		Draw::sphere(G3D::Sphere(Vector3(0,0,0),3), rd, Color3::red(), Color4::clear());
 
 		//makeFlag(Vector3(1, 0.5, 0.5), rd);
 		
@@ -470,26 +470,54 @@ void Demo::onGraphics(RenderDevice* rd) {
 	//app->debugFont->draw2D("Dynamica 2004-2005 Simulation Client version " + VERSION + str, Vector2(0,0), 20, Color3::white(), Color3::black());
 	//app->debugFont->draw2D("Debug Mode Enabled", Vector2(0,30), 20, Color3::white(), Color3::black());
 
-
+	
 
 	rd->pushState();
 	
-	rd->setTexture(0, go);
-
+	/*rd->setTexture(0, go);
+	
 
 	rd->enableAlphaWrite();
-	rd->setTexCoord(0, Vector2(0.0F, 0.0F));
-	rd->setTexCoord(0, Vector2(1.0F, 0.0F));
-	rd->setTexCoord(0, Vector2(0.0F, 1.0F));
-	rd->setTexCoord(0, Vector2(1.0F, 1.0F));
-	rd->setTextureCombineMode(0, RenderDevice::CombineMode::TEX_ADD);
+	//rd->setTexCoord(0, Vector2(0.0F, 0.0F));
+	//rd->setTexCoord(0, Vector2(1.0F, 0.0F));
+	//rd->setTexCoord(0, Vector2(0.0F, 1.0F));
+	//rd->setTexCoord(0, Vector2(1.0F, 1.0F));
+	//rd->setTextureCombineMode(0, RenderDevice::CombineMode::TEX_ADD);
+	
 	rd->beginPrimitive(RenderDevice::QUADS);
 	rd->sendVertex(Vector2(10,25));
 	rd->sendVertex(Vector2(70,25));
 	rd->sendVertex(Vector2(70,85));
 	rd->sendVertex(Vector2(10,85));
 	rd->endPrimitive();
-	rd->setTexture(0, NULL);
+	rd->setTexture(0, NULL);*/
+
+	
+		int texid = go->getOpenGLID();
+		rd->beforePrimitive();
+
+		//glColor3d(255,255,255);
+		
+		glEnable( GL_TEXTURE_2D );
+		glEnable(GL_BLEND);// you enable blending function
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+		glBindTexture( GL_TEXTURE_2D, texid);
+		//glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+		glBegin( GL_QUADS );
+		glTexCoord2d(0.0,0.0);
+		glVertex2f( 10, 25 );
+		glTexCoord2d( 1.0,0.0 );
+		glVertex2f( 70, 25 );
+		glTexCoord2d( 1.0,1.0 );
+		glVertex2f( 70, 85 );
+		glTexCoord2d( 0.0,1.0 );
+		glVertex2f( 10, 85 );
+		glEnd();
+
+		glDisable( GL_TEXTURE_2D );
+
+		rd->afterPrimitive();
+
 	rd->popState();