Skip to content

Updated the Intel8080 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexSwift wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updated the Intel8080 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdec116
Update 8080.lua
AlexSwift Mar 29, 2015
68a634b
Update core.lua
AlexSwift Mar 29, 2015
d65da64
Update cl_init.lua
AlexSwift Mar 29, 2015
2e10a89
Update shared.lua
AlexSwift Mar 29, 2015
92293b0
Fully functioning
AlexSwift Mar 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions GEM/data/gem_emulator/GBZ80/Tetris.gb_hex.txt
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions GEM/data/gem_emulator/GBZ80/pkmn_jaune.gb_hex.txt
View file
Open in desktop

Large diffs are not rendered by default.

158 changes: 143 additions & 15 deletions GEM/lua/entities/gem_emulator/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@ end
-- Desc: Creates the necessary folders if they don't exist
----------------------------------------------------------------------
function ENT:CreateFolders()
if not file.IsDir( "gem_emulator" ) then
if not file.IsDir( "gem_emulator","DATA" ) then
file.CreateDir( "gem_emulator" )
end

if not file.IsDir( "gem_emulator/8080" ) then
if not file.IsDir( "gem_emulator/8080","DATA" ) then
file.CreateDir( "gem_emulator/8080" )
end

if not file.IsDir( "gem_emulator/GBZ80" ) then
if not file.IsDir( "gem_emulator/GBZ80","DATA" ) then
file.CreateDir( "gem_emulator/GBZ80" )
end
end
Expand All @@ -144,7 +144,7 @@ function ENT:ListROMs( fld )

local folder = "gem_emulator/" .. fld

local files = file.Find( folder .. "/*.txt" )
local files = file.Find( folder .. "/*.txt", 'DATA' )

if #files == 0 then
self.buttons = { y = 15 + 25 * 2, { text = " Back ", OnPress = self.LoadMainMenu } }
Expand Down Expand Up @@ -361,8 +361,8 @@ function ENT:Draw()

self.Emulator:Draw()

local OldTex = matscreen:GetMaterialTexture("$basetexture")
matscreen:SetMaterialTexture("$basetexture", self.Emulator.RTMaterial)
local OldTex = matscreen:GetTexture("$basetexture")
matscreen:SetTexture("$basetexture", self.Emulator.RTMaterial)

local pos, ang, scale = draw_data[1], draw_data[2], draw_data[3]
cam_Start3D2D( self:LocalToWorld( pos ), self:LocalToWorldAngles( ang ), scale )
Expand All @@ -373,7 +373,7 @@ function ENT:Draw()

cam_End3D2D()

matscreen:SetMaterialTexture("$basetexture", OldTex)
matscreen:SetTexture("$basetexture", OldTex)
else
local pos, ang, scale = draw_data[1], draw_data[2], draw_data[3]
cam_Start3D2D( self:LocalToWorld( pos ), self:LocalToWorldAngles( ang ), scale )
Expand Down Expand Up @@ -455,20 +455,148 @@ end
-- Name: Think
-- Desc: Handles the touch screen among other things
----------------------------------------------------------------------
local keys = {}
for k,v in pairs( _E ) do
if k:sub(1,4) == "KEY_" then
keys[k] = v
end
end
local keys = {
Copy link
Owner

@Divran Divran Mar 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code above this that you erased already worked fine, you just had to change _E to _G

['KEY_1'] = KEY_1 ,
['KEY_2'] = KEY_2 ,
['KEY_3'] = KEY_3 ,
['KEY_4'] = KEY_4 ,
['KEY_5'] = KEY_5 ,
['KEY_6'] = KEY_6 ,
['KEY_7'] = KEY_7 ,
['KEY_8'] = KEY_8 ,
['KEY_9'] = KEY_9 ,
['KEY_A'] = KEY_A ,
['KEY_APOSTROPHE'] = KEY_APOSTROPHE ,
['KEY_APP'] = KEY_APP ,
['KEY_B'] = KEY_B ,
['KEY_BACKQUOTE'] = KEY_BACKQUOTE ,
['KEY_BACKSLASH'] = KEY_BACKSLASH ,
['KEY_BACKSPACE'] = KEY_BACKSPACE ,
['KEY_BREAK'] = KEY_BREAK ,
['KEY_C'] = KEY_C ,
['KEY_CAPSLOCK'] = KEY_CAPSLOCK ,
['KEY_CAPSLOCKTOGG'] = KEY_CAPSLOCKTOGG ,
['KEY_COMMA'] = KEY_COMMA ,
['KEY_COUNT'] = KEY_COUNT ,
['KEY_D'] = KEY_D ,
['KEY_DELETE'] = KEY_DELETE ,
['KEY_DOWN'] = KEY_DOWN ,
['KEY_E'] = KEY_E ,
['KEY_END'] = KEY_END ,
['KEY_ENTER'] = KEY_ENTER ,
['KEY_EQUAL'] = KEY_EQUAL ,
['KEY_ESCAPE'] = KEY_ESCAPE ,
['KEY_F'] = KEY_F ,
['KEY_F1'] = KEY_F1 ,
['KEY_F10'] = KEY_F10 ,
['KEY_F11'] = KEY_F11 ,
['KEY_F12'] = KEY_F12 ,
['KEY_F2'] = KEY_F2 ,
['KEY_F3'] = KEY_F3 ,
['KEY_F4'] = KEY_F4 ,
['KEY_F5'] = KEY_F5 ,
['KEY_F6'] = KEY_F6 ,
['KEY_F7'] = KEY_F7 ,
['KEY_F8'] = KEY_F8 ,
['KEY_F9'] = KEY_F9 ,
['KEY_FIRST'] = KEY_FIRST ,
['KEY_G'] = KEY_G ,
['KEY_H'] = KEY_H ,
['KEY_HOME'] = KEY_HOME ,
['KEY_I'] = KEY_I ,
['KEY_INSERT'] = KEY_INSERT ,
['KEY_J'] = KEY_J ,
['KEY_K'] = KEY_K ,
['KEY_L'] = KEY_L ,
['KEY_LALT'] = KEY_LALT ,
['KEY_LAST'] = KEY_LAST ,
['KEY_LBRACKET'] = KEY_LBRACKET ,
['KEY_LCONTROL'] = KEY_LCONTROL ,
['KEY_LEFT'] = KEY_LEFT ,
['KEY_LSHIFT'] = KEY_LSHIFT ,
['KEY_LWIN'] = KEY_LWIN ,
['KEY_M'] = KEY_M ,
['KEY_MINUS'] = KEY_MINUS ,
['KEY_N'] = KEY_N ,
['KEY_NONE'] = KEY_N ,
['KEY_NUMLOCK'] = KEY_NUMLOCK ,
['KEY_NUMLOCKTOGGLE'] = KEY_NUMLOCKTOGGLE ,
['KEY_O'] = KEY_O ,
['KEY_P'] = KEY_P ,
['KEY_PAD_0'] = KEY_PAD_0 ,
['KEY_PAD_1'] = KEY_PAD_1 ,
['KEY_PAD_2'] = KEY_PAD_2 ,
['KEY_PAD_3'] = KEY_PAD_3 ,
['KEY_PAD_4'] = KEY_PAD_4 ,
['KEY_PAD_5'] = KEY_PAD_5 ,
['KEY_PAD_6'] = KEY_PAD_6 ,
['KEY_PAD_7'] = KEY_PAD_7 ,
['KEY_PAD_8'] = KEY_PAD_8 ,
['KEY_PAD_9'] = KEY_PAD_9 ,
['KEY_PAD_DECIMAL'] = KEY_PAD_DECIMAL ,
['KEY_PAD_DIVIDE'] = KEY_PAD_DIVIDE ,
['KEY_PAD_ENTER'] = KEY_PAD_ENTER ,
['KEY_PAD_MINUS'] = KEY_PAD_MINUS ,
['KEY_PAD_MULTIPLY'] = KEY_PAD_MULTIPLY ,
['KEY_PAD_PLUS'] = KEY_PAD_PLUS ,
['KEY_PAGEDOWN'] = KEY_PAGEDOWN ,
['KEY_PAGEUP'] = KEY_PAGEUP ,
['KEY_PERIOD'] = KEY_PERIOD ,
['KEY_Q'] = KEY_Q ,
['KEY_R'] = KEY_R ,
['KEY_RALT'] = KEY_RALT ,
['KEY_RBRACKET'] = KEY_RBRACKET ,
['KEY_RCONTROL'] = KEY_RCONTROL ,
['KEY_RIGHT'] = KEY_RIGHT ,
['KEY_RSHIFT'] = KEY_RSHIFT ,
['KEY_RWIN'] = KEY_RWIN ,
['KEY_S'] = KEY_S ,
['KEY_SCROLLLOCK'] = KEY_SCROLLLOCK ,
['KEY_SCROLLLOCKTOGGLE'] = KEY_SCROLLLOCKTOGGLE ,
['KEY_SEMICOLON'] = KEY_SEMICOLON ,
['KEY_SLASH'] = KEY_SLASH ,
['KEY_SPACE'] = EY_SPACE ,
['KEY_T'] = KEY_T ,
['KEY_TAB'] = KEY_TAB ,
['KEY_U'] = KEY_U ,
['KEY_UP'] = KEY_UP ,
['KEY_V'] = KEY_V ,
['KEY_W'] = KEY_W ,
['KEY_X'] = KEY_X ,
['KEY_XBUTTON_A'] = KEY_XBUTTON_A ,
['KEY_XBUTTON_B'] = KEY_XBUTTON_B ,
['KEY_XBUTTON_BACK'] = KEY_XBUTTON_BACK ,
['KEY_XBUTTON_DOWN'] = KEY_XBUTTON_DOWN ,
['KEY_XBUTTON_LEFT'] = KEY_XBUTTON_LEFT ,
['KEY_XBUTTON_LEFT_SHOULDER'] = KEY_XBUTTON_LEFT_SHOULDER ,
['KEY_XBUTTON_LTRIGGER'] = KEY_XBUTTON_LTRIGGER ,
['KEY_XBUTTON_RIGHT'] = KEY_XBUTTON_RIGHT ,
['KEY_XBUTTON_RIGHT_SHOULDER'] = KEY_XBUTTON_RIGHT_SHOULDER ,
['KEY_XBUTTON_RTRIGGER'] = KEY_XBUTTON_RTRIGGER ,
['KEY_XBUTTON_START'] = KEY_XBUTTON_START ,
['KEY_XBUTTON_STICK1'] = KEY_XBUTTON_STICK1 ,
['KEY_XBUTTON_STICK2'] = KEY_XBUTTON_STICK2 ,
['KEY_XBUTTON_UP'] = KEY_XBUTTON_UP ,
['KEY_XBUTTON_X'] = KEY_XBUTTON_X ,
['KEY_XBUTTON_Y'] = KEY_XBUTTON_Y ,
['KEY_XSTICK1_DOWN'] = KEY_XSTICK1_DOWN ,
['KEY_XSTICK1_LEFT'] = KEY_XSTICK1_LEFT ,
['KEY_XSTICK1_RIGHT'] = KEY_XSTICK1_RIGHT ,
['KEY_XSTICK1_UP'] = KEY_XSTICK1_UP ,
['KEY_XSTICK2_DOWN'] = KEY_XSTICK2_DOWN ,
['KEY_XSTICK2_LEFT'] = KEY_XSTICK2_LEFT ,
['KEY_XSTICK2_RIGHT'] = KEY_XSTICK2_RIGHT ,
['KEY_XSTICK2_UP'] = KEY_XSTICK2_UP ,
['KEY_Y'] = KEY_Y ,
['KEY_Z'] = KEY_Z
}

local validKeys = { A = true, B = true, Start = true, Select = true, Up = true, Left = true, Down = true, Right = true, Exit = true }


function ENT:Think()
if not self:GetPly() then return end -- Wait until the owner has been transferred
if not self.errordata and self.Emulator then self.Emulator:Think() end

if self:GetPly() ~= LocalPlayer() then return end -- Only do below actions for the owner of the screen

if self.Emulator and not self.errordata then
Expand Down Expand Up @@ -548,7 +676,7 @@ function ENT:ExtractKeyBinds()
self.Keys = {}
self.KeyPresses = {}

if not file.IsDir( "gem_emulator" ) or not file.Exists( "gem_emulator/keybinds.txt" ) then
if not file.IsDir( "gem_emulator", 'DATA' ) or not file.Exists( "gem_emulator/keybinds.txt", 'IsDir' ) then
self.Keys.A = KEY_H
self.Keys.B = KEY_J
self.Keys.Start = KEY_ENTER
Expand Down
15 changes: 15 additions & 0 deletions GEM/lua/entities/gem_emulator/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,21 @@ function ENT:SpawnFunction( ply, tr )
return ent
end

function SpawnFunction( ply, tr )
if not tr.Hit then return end
if not ply:CheckLimit( "gem_emulators" ) then return end

local pos = tr.HitPos + tr.HitNormal * 50
local ent = ents.Create( "gem_emulator" )
ent:SetPly( ply )
ent:SetPos( pos )
ent:SetAngles( Angle(90,ply:GetAngles().y+180,0) )
ent:Spawn()
ent:Activate()

return ent
end

----------------------------------------------------------------------
-- Name: Initialize
-- Desc: -
Expand Down
Loading